Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MDB Ignore] Monkey to species, take 2 #10943

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
472b953
converted
Tsar-Salat May 7, 2024
ebf8804
reverts shitty mutations repath
Tsar-Salat May 7, 2024
1c7429f
missing stuffs
Tsar-Salat May 7, 2024
cad12ba
ventcrawler 1
Tsar-Salat May 7, 2024
1f23f7f
515
Tsar-Salat May 7, 2024
7a2b6cc
rkidiot
Tsar-Salat May 7, 2024
63ad37f
invisible equipment
Tsar-Salat May 7, 2024
c75ff38
fix monkey duplicate eyes
Tsar-Salat May 8, 2024
01f37d9
readd teratomas
Tsar-Salat May 8, 2024
6bf6950
readd changeling ability
Tsar-Salat May 8, 2024
88c97d9
Icon changes
DrDuckedGoose May 8, 2024
0522830
Merge branch 'master' into monke-to-species
Tsar-Salat May 10, 2024
5cfe626
Icon changes
DrDuckedGoose May 8, 2024
9c5c8a2
Fixes
DrDuckedGoose May 9, 2024
8427366
Icons for stinky & Fixes
DrDuckedGoose May 9, 2024
83df33c
whoops
DrDuckedGoose May 9, 2024
6ebe8da
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat May 11, 2024
469bc2f
fix helmet
Tsar-Salat May 11, 2024
fe1a6f5
severedmonkey tail sprite to fix unit test
Tsar-Salat May 11, 2024
232fb51
Merge branch 'monke-to-species' into pr/10943
DrDuckedGoose May 12, 2024
cb60d2b
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat May 19, 2024
3b064f9
Merge pull request #56 from DrDuckedGoose/pr/10943
Tsar-Salat May 21, 2024
0204070
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat May 23, 2024
3e0f987
https://github.com/tgstation/tgstation/pull/62127
Tsar-Salat May 23, 2024
b0c4f2c
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat May 27, 2024
8c763f6
restraint fix
Tsar-Salat May 27, 2024
d990741
https://github.com/tgstation/tgstation/pull/56633
Tsar-Salat May 27, 2024
f1313ed
https://github.com/tgstation/tgstation/pull/57368
Tsar-Salat May 27, 2024
2f98191
Merge branch 'master' into monke-to-species
Tsar-Salat Jun 11, 2024
19ee5f8
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Jun 13, 2024
fa65c1b
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Jun 26, 2024
897d0e8
Merge remote-tracking branch 'Upstream/master' into monke-to-species
Tsar-Salat Jun 30, 2024
6d1618d
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Jul 9, 2024
6d829ae
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Aug 8, 2024
0057823
fixio
Tsar-Salat Aug 10, 2024
e851213
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Aug 15, 2024
79748d8
fix monkey --> human resizing after transform. Roundstart monkeys fix
Tsar-Salat Aug 15, 2024
2df76f0
dual-wield fix
Tsar-Salat Aug 15, 2024
8d9c17b
Merge remote-tracking branch 'Upstream/master' into monke-to-species
Tsar-Salat Aug 29, 2024
13eaefc
Merge remote-tracking branch 'Upstream/master' into monke-to-species
Tsar-Salat Aug 30, 2024
57ffd4d
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 8, 2024
af975a4
guh
Tsar-Salat Sep 8, 2024
318c896
REALBASELINE
Tsar-Salat Sep 8, 2024
0e33ce8
redo search&replace
Tsar-Salat Sep 8, 2024
25bc88f
deltstation
Tsar-Salat Sep 8, 2024
0502e09
ups
Tsar-Salat Sep 8, 2024
160f376
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 11, 2024
0a30ff7
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 11, 2024
7587834
tails
Tsar-Salat Sep 11, 2024
c56d1a8
woops
Tsar-Salat Sep 11, 2024
a215b09
code changes?
Tsar-Salat Sep 11, 2024
da34dfd
declare
Tsar-Salat Sep 11, 2024
82cf34b
If it has a tail...
DrDuckedGoose Sep 11, 2024
3d9fe85
Merge branch 'monke-to-species' of https://github.com/Tsar-Salat/BeeS…
DrDuckedGoose Sep 11, 2024
474dc7b
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 16, 2024
c29a190
move monkey tails into humans
Tsar-Salat Sep 16, 2024
3d8ca30
Merge branch 'master' into monke-to-species
Tsar-Salat Sep 19, 2024
e4e42c2
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 21, 2024
42acf01
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 25, 2024
f1e4c32
fix
Tsar-Salat Sep 25, 2024
dda8aee
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Sep 26, 2024
e7fc9b9
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Oct 3, 2024
957391e
Merge remote-tracking branch 'BeeStation/master' into monke-to-species
Tsar-Salat Oct 5, 2024
2cae8c3
deltafix
Tsar-Salat Oct 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/Prefab/Departments.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions _maps/RandomRooms/3x5/sk_rdm084_monky.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 6 additions & 18 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions _maps/RandomZLevels/research.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions _maps/arenas/monkey.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions _maps/map_files/BoxStation/BoxStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions _maps/map_files/CorgStation/CorgStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading