Commit Graph

16247 Commits

Author SHA1 Message Date
silicons 9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824
Few issues, solved.
2020-06-28 12:53:54 -07:00
silicons abbbda15ef Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes
fixes slime blood colour
2020-06-28 12:53:36 -07:00
Lin f1aedce87b Merge pull request #12621 from Citadel-Station-13/silicons-patch-6
fixes a few things with the new Life()
2020-06-28 13:36:55 -05:00
Ghommie 436c41d343 Forgot about this. 2020-06-28 19:33:22 +02:00
Timothy Teakettle d6cfd957ad fix shoes 2020-06-28 17:26:50 +01:00
Ghommie 65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
Ghommie 6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
Ghom a2a2476243 Update shaft_miner.dm 2020-06-28 02:03:35 +02:00
Ghommie 86241dbe8d ah 2020-06-28 01:15:36 +02:00
Ghommie a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
kappa-sama 548fabfb2d viscera cleanup detail 2020-06-27 18:21:22 -04:00
kappa-sama fec2d1aded someone call the janitor 2020-06-27 18:21:01 -04:00
kappa-sama bf6a1b3de4 cleanup crew 2020-06-27 18:20:40 -04:00
kappa-sama 5787a75dee node 2020-06-27 18:20:13 -04:00
kappa-sama d98175d947 decal painter to lathe 2020-06-27 18:19:49 -04:00
Ghom 0d5888daf6 Merge pull request #12628 from Citadel-Station-13/silicons-patch-11
adds a __nan() proc to fetch a nan number because there's no other way to for debugging
2020-06-28 00:19:38 +02:00
kappa-sama 61caf7dde2 spraycan 2020-06-27 18:15:20 -04:00
kappa-sama 579727d41d spraycans 2020-06-27 18:14:20 -04:00
kappa-sama a96bd52c91 airlock painting 2020-06-27 18:13:09 -04:00
silicons 2ab69c0170 Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
2020-06-27 14:54:57 -07:00
silicons 5c10370326 Merge pull request #12601 from Detective-Google/piggyback
piggyback carrying people is no longer comically slow
2020-06-27 14:54:44 -07:00
silicons e51bee9649 Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
2020-06-27 14:54:31 -07:00
silicons 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
silicons 8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
2020-06-27 14:52:59 -07:00
Ghom 58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
2020-06-27 22:14:17 +02:00
silicons 0c4e1e7696 Update SDQL_2_wrappers.dm 2020-06-27 07:17:29 -07:00
L 3aefc8ae10 tg changes 2020-06-27 07:01:19 -03:00
silicons 30a4bb5683 Update client_procs.dm 2020-06-27 01:20:15 -07:00
silicons 1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons 0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
silicons 3c4d3791a4 Update life.dm 2020-06-26 17:21:20 -07:00
Timothy Teakettle 9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Timothy Teakettle 334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
silicons 13c2c335f4 Update chat_commands.dm 2020-06-26 10:50:09 -07:00
Ghommie d1025b10cd mh. 2020-06-26 18:49:20 +02:00
Ghommie 8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Artur 765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
Detective-Google 8998373241 Update code/modules/mob/living/living_mobility.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-25 19:58:41 -05:00
Detective Google ea5b155057 lying down now isnt random 2020-06-25 19:39:37 -05:00
Detective Google 5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
silicons cd893c60a2 Merge pull request #12600 from Ghommie/Ghommie-cit820
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 20:27:16 -07:00
b1tt3r1n0 a780b9037c Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
2020-06-24 23:07:56 -04:00
Detective Google a4c243331c aeugh 2020-06-24 17:25:39 -05:00
Ghom 0f3cd7bbd8 Merge pull request #12588 from Citadel-Station-13/Linzolle-patch-1
organs now decay while dead again
2020-06-24 23:36:07 +02:00
Ghommie fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
Timothy Teakettle 97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons 39b58f0057 Merge pull request #12581 from Detective-Google/shunties
prevents shunted AIs from doomsdaying (tg#51284)
2020-06-24 08:44:48 -07:00
silicons ee0173185b Merge pull request #12584 from Detective-Google/my-face-when-I-sledgehammer-away-missions-uwu
Kicks away mission loot in the teeth
2020-06-24 08:44:38 -07:00