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
|
7c4e2c6860
|
Update medbot.dm
|
2019-10-17 12:49:49 -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 |
|
r4d6
|
c97252eaa6
|
Give felinids decoratives wings
|
2019-10-17 12:11:03 -04:00 |
|
r4d6
|
7fbe2abb2c
|
Give Lizardpeoples decorative wings
|
2019-10-17 12:09:27 -04:00 |
|
r4d6
|
3f20175220
|
Give slimepersons decoratives wings
|
2019-10-17 12:08:49 -04:00 |
|
r4d6
|
558a92c519
|
Give humans decorative wings
|
2019-10-17 12:08:09 -04:00 |
|
Thalpy
|
67af19a7f0
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-17 16:20:38 +01:00 |
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
Poojawa
|
4fdddc7b4d
|
clears a merge conflict
|
2019-10-17 05:37:44 -05:00 |
|
Ghommie
|
f73516a17f
|
made it into config.
|
2019-10-17 04:44:30 +02:00 |
|
Ghommie
|
cffa3f8cea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-10-17 03:09:59 +02:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02: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
|
5b5ff67201
|
Update medbot.dm
|
2019-10-16 03:51:57 -07:00 |
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05: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 |
|
Ghommie
|
aa6860250b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-10-15 20:40:07 +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 |
|
deathride58
|
50c27df28f
|
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-15 03:48:44 -04:00 |
|
deathride58
|
b3a81dce01
|
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
|
2019-10-14 18:18:32 -04: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
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05: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 |
|
kevinz000
|
d28b0fa5f9
|
Update species.dm
|
2019-10-13 13:49:55 -07:00 |
|
Putnam
|
1b97c50ef7
|
Makes pod people not constantly slightly fat
|
2019-10-12 17:50:51 -07:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|