 kevinz000
|
65841a9485
|
Merge pull request #9507 from Ghommie/Ghommie-cit238
Ports some in operator misuse bugfixes.
|
2019-10-17 12:59:44 -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
|
5e049bc64a
|
Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish
foot fetish content for kevin (ankle coverings)
|
2019-10-17 12:49:08 -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 |
|
|
MrJWhit
|
09f481c319
|
Increases bomb resistance in cult robes
From 25 -> 65
|
2019-10-17 12:28:11 -04: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
|
697818e6f7
|
Merge branch 'master' into access-clarifications
|
2019-10-17 06:13:47 -05: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 |
|
|
Trilbyspaceclone
|
113f62a705
|
right
we removed my tools...
|
2019-10-17 01:38:29 -04:00 |
|
|
Ghommie
|
f73516a17f
|
made it into config.
|
2019-10-17 04:44:30 +02:00 |
|
|
Trilbyspaceclone
|
c0034e93a1
|
readds chose goose
|
2019-10-16 22:31:34 -04:00 |
|
|
Trilbyspaceclone
|
c91421984c
|
Merge branch 'master' into Cargo_rebalance
|
2019-10-16 22:30:12 -04: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
|
03c68e091f
|
Neat.
|
2019-10-17 02:52:02 +02:00 |
|
|
Ghommie
|
f2cd85e550
|
Ports "You can now click on objects and mobs below flaps and signs"
|
2019-10-17 02:45:13 +02:00 |
|
|
kappa-sama
|
cbf02e76a4
|
fixes cringe
why is this broken and who added this
|
2019-10-16 19:47:14 -04: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 |
|
|
Ghommie
|
57794421e3
|
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
|
2019-10-16 23:57:31 +02:00 |
|
|
Ghommie
|
f3a9cac11e
|
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
|
2019-10-16 23:39:21 +02:00 |
|
|
Linzolle
|
1690596047
|
you asked for this kevin
|
2019-10-16 15:53:11 -05: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 |
|
|
Poojawa
|
4ee608e0c7
|
Fixes blood transfusion, QOL to IV drippers
|
2019-10-16 09:15:04 -05:00 |
|
|
kevinz000
|
5b5ff67201
|
Update medbot.dm
|
2019-10-16 03:51:57 -07:00 |
|
|
Poojawa
|
14e0087fbd
|
blood sorta works again, needs better fixing tho
|
2019-10-16 04:38:31 -05: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
|
e187f806a0
|
Merge pull request #9479 from lolman360/ltsurge
fixes bug with new surgerytools examine
|
2019-10-15 23:04:15 -07:00 |
|
|
kevinz000
|
6d1035e995
|
Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
|
2019-10-15 22:59:45 -07:00 |
|
|
kevinz000
|
ae19dd16d8
|
Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms
Borgs are now consumable by scrub pups.
|
2019-10-15 22:59:20 -07:00 |
|
|
kevinz000
|
3d5facdea5
|
Merge pull request #9502 from Putnam3145/pandemic-qol2
Makes beaker spawn on pandemic instead of on user when hands full
|
2019-10-15 22:53:44 -07:00 |
|
|
Poojawa
|
2f9771b1a9
|
Maybe it's really just as simple as...
|
2019-10-16 00:48:38 -05:00 |
|
|
Ghommie
|
e8b777f162
|
typo fixes
|
2019-10-16 05:10:44 +02:00 |
|
|
Fermi
|
f587beeef4
|
2 hats and undoes halloween accidental change
|
2019-10-15 22:56:42 +01:00 |
|
|
Fermi
|
00adead300
|
Fixes syringes too.
|
2019-10-15 21:43:04 +01:00 |
|
|
Ghommie
|
80ba44e5a2
|
Smells like work in progress
|
2019-10-15 22:03:38 +02:00 |
|
|
Ghommie
|
32013f2aeb
|
More whacky situations.
|
2019-10-15 21:59:27 +02:00 |
|
|
Ghommie
|
839f324c99
|
I need a code quality test.
|
2019-10-15 21:39:13 +02:00 |
|
|
Ghommie
|
7e3a812460
|
Fixing tracking implant teleport issues.
|
2019-10-15 21:32:01 +02: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
|
d9af826333
|
whatever
|
2019-10-15 13:19:56 -05:00 |
|
|
Poojawa
|
1780f1addd
|
animal nom still don't work but runtimes are fixed
whatever
|
2019-10-15 12:11:46 -05:00 |
|
|
Poojawa
|
04b414f6b4
|
Improving Sounds yet again
|
2019-10-15 08:58:22 -05:00 |
|