Commit Graph

10203 Commits

Author SHA1 Message Date
YakumoChen e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen 6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen 61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen 37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2019-10-19 19:52:21 -07:00
r4d6 49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
Linzolle eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Ghommie fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Linzolle 39788c8216 fix abductors 2019-10-18 23:45:13 -05:00
Linzolle c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Poojawa c7e1449a3c re-adds blood crate 2019-10-18 06:02:23 -05:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
TrilbySpaceClone 1707d6e6d2 er? 2019-10-18 01:22:19 -04:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
Linzolle 5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000 a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
Linzolle 380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors 2019-10-17 19:27:34 -05:00
Linzolle b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
Linzolle 3b1e66ad05 more consistent naming 2019-10-17 17:23:47 -05:00
Linzolle 88814415dc tend wounds 2019-10-17 16:59:33 -05:00
kevinz000 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
kevinz000 6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem
nerfs styptic/silversulf/synthflesh to have overdoses
2019-10-17 13:18:58 -07:00
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 d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
2019-10-17 13:09:55 -07:00
kevinz000 1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon
Removes antimagic from holymelon
2019-10-17 13:07:40 -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 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 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
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
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
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
kappa-sama cbf02e76a4 fixes cringe
why is this broken and who added this
2019-10-16 19:47:14 -04: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
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