Commit Graph

2925 Commits

Author SHA1 Message Date
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
kevinz000
3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239
properly blacklists space skeletons kek.
2019-10-17 13:11:05 -07:00
kevinz000
805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236
Removes the need of "_l" suffixes for digitigrade clothing on mob states
2019-10-17 13:06:17 -07:00
kevinz000
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves
Halloween Dwarves
2019-10-17 12:58:28 -07:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
JTGSZ
f1b2eb93d7 Moonshiner doesn't exist here 2019-10-16 13:19:39 -04:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000
6d1035e995 Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
2019-10-15 22:59:45 -07:00
Poojawa
2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Ghommie
fb94e4fef1 properly blacklists space skeletons kek. 2019-10-15 20:45:49 +02:00
Poojawa
1780f1addd animal nom still don't work but runtimes are fixed
whatever
2019-10-15 12:11:46 -05:00
Poojawa
4396bd4280 runtime fixings I guess 2019-10-15 07:08:00 -05:00
Poojawa
9308ee517f fixing some belly mode quirks 2019-10-15 06:49:31 -05:00
deathride58
df17f34eb6 Merge pull request #9488 from Ghommie/Ghommie-cit231
Adds some missing species_traits for cloth, clockwork and cult golems.
2019-10-15 06:20:43 -04:00
deathride58
ffa7898f45 Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
2019-10-15 06:19:26 -04:00
Poojawa
d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa
ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
JTGSZ
3a45027ed8 Moved var out of organ into its proc. 2019-10-14 17:56:18 -04:00
JTGSZ
9ccff735b8 update comments 2019-10-14 17:42:34 -04:00
JTGSZ
1af18741d9 Commit, suggestions. 2019-10-14 17:37:02 -04:00
deathride58
6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
JTGSZ
45367fbe24 unneeded comment as they aren't special now 2019-10-14 10:35:41 -04:00
JTGSZ
9cac961ba3 Halloween lava dwarves 2019-10-14 10:27:09 -04:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
9c1fcc341d Removes the need of "_l" suffixes for digitigrade clothing on mob states. 2019-10-14 08:20:23 +02:00
Poojawa
fad517fccb oh let's unsnowflake this one too I guess 2019-10-13 19:06:46 -05:00
Poojawa
198f2b7add Fixes missing decorative wing states 2019-10-13 19:02:28 -05:00
Thalpy
e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Ghommie
ff3972247a Fixes some missing species_traits for cloth, clockwork and cult golems. 2019-10-13 23:40:52 +02:00
kevinz000
48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
kevinz000
3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
2019-10-13 13:55:21 -07:00
Putnam
1b97c50ef7 Makes pod people not constantly slightly fat 2019-10-12 17:50:51 -07:00
kevinz000
076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000
8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
kevinz000
f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000
e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
2019-10-11 12:13:19 -07:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
kevinz000
9cd75c82a4 Merge pull request #9435 from Linzolle/firefix
fix fireman carry offhand not automatically deleting itself
2019-10-11 12:09:14 -07:00
kevinz000
4ab08802a1 Merge pull request #9442 from YakumoChen/air-hog
Reverts jetpack efficiency from #9307
2019-10-11 12:08:44 -07:00
kevinz000
1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224
standarizes mobs' can_equip arguments.
2019-10-11 12:05:12 -07:00
Fermi
cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
r4d6
3e7131c7f6 Update wings.dm 2019-10-11 05:43:55 -04:00
YakumoChen
55e7645773 updating branch 2019-10-11 04:55:57 -04:00
JTGSZ
988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
r4d6
1b08c541e2 Update wings.dm 2019-10-10 21:11:48 -04:00