Commit Graph

19834 Commits

Author SHA1 Message Date
Ghom 5e10f822e6 Update energy.dm 2020-02-17 13:40:37 +01:00
Cameron! 28a589d2d1 diethylamine > ammonia 2020-02-17 04:32:39 -08:00
Ghom ffe1c794eb Changes cult stunhand when halos are out (#11053)
* Changes cult stunhand when halos are out

Turns the stunhand into a burn + knockback hand.  So it remains more defensive than offensive.

* Changes the desc a little

Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim"  Thanks Justin!

* Requested changes

Requested changes
2020-02-17 13:29:51 +01:00
Seris02 b271096b77 rest key, v, version two (#11090)
* maybe

* skreeeee

* yes

* fucccccccccck

* happy now

* Update interface.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-17 12:47:19 +01:00
Ghom b028b296f5 Update mob_holder.dm 2020-02-17 12:17:33 +01:00
Ghom 66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
Cameron! 78fad64d56 this is no longer necessary 2020-02-16 15:54:41 -08:00
Cameron! a4a5efbc11 ghommble's other changes 2020-02-16 15:48:22 -08:00
kevinz000 262b4d95fb Update projectile.dm 2020-02-16 16:44:29 -07:00
Cameron! 3ecd1b75d4 ghommald's changes 2020-02-16 15:32:05 -08:00
Trilbyspaceclone c5eaac62bd Update materials.dm 2020-02-16 18:26:22 -05:00
Trilbyspaceclone 0315802330 Update armory.dm 2020-02-16 18:25:54 -05:00
Ghommie de1b2c09ac Merge branch 'Ghommie-cit583' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit583 2020-02-17 00:16:43 +01:00
Ghommie aba636a44c ok 2020-02-17 00:13:16 +01:00
kevinz000 cdf358b97e Merge pull request #11101 from Ghommie/Ghommie-cit581
Porting (admin-only) pair pinpointers and fixing an edge case runtime.
2020-02-16 16:08:11 -07:00
Lin 794aeb81c2 Merge pull request #11060 from kevinz000/stuff
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
Trilbyspaceclone 0f7618b348 Update organic.dm 2020-02-16 14:07:00 -05:00
Lin 544c7188c3 Merge pull request #11120 from Citadel-Station-13/Ghommie-patch-2
Fixing sprint buffer cost and regen being rounded down.
2020-02-16 13:05:50 -06:00
Lin a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
Ghom 32487a95a3 Fixing sprint buffer cost and regen being rounded down. 2020-02-16 19:23:41 +01:00
Ghommie 1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
Unknown c0295156ff Adds synthmeat reaction 2020-02-16 11:42:30 -05:00
Unknown 3286f43d90 Didnt know I could make it a subtype 2020-02-16 11:17:54 -05:00
Ghom 3703110dda Makes the mob holder examine less dumb. 2020-02-16 16:10:20 +01:00
Ghom eaa45d4b35 Update implant_hijack.dm 2020-02-16 15:48:38 +01:00
Ghommie 23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
Unknown 313f544aee Make it require some heating 2020-02-16 08:34:08 -05:00
Unknown 38f32d28b7 Mixable Synthblood 2020-02-16 08:06:22 -05:00
Unknown f4734e44f0 o ye this should be something else 2020-02-16 07:52:34 -05:00
Unknown f0b3021f5d I miss my powergame 2020-02-16 07:41:26 -05:00
CameronWoof 206e546254 reordering these designs 2020-02-16 04:15:50 -08:00
kevinz000 379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
necromanceranne c79ecf4db7 So no mech logging, huh? 2020-02-16 22:56:10 +11:00
CameronWoof 14e41e8d68 adds diethylamine and saltpetre to the biogenerator 2020-02-16 03:52:07 -08:00
necromanceranne 98d33544d8 I forgot the melon shot 2020-02-16 22:39:47 +11:00
necromanceranne 5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
Ghommie 1d9982d00a Virology support for synthetic blood and some blood subtypes removal. 2020-02-16 10:36:16 +01:00
Seris02 788a9f5b59 WOOPS 2020-02-16 16:39:35 +08:00
Hatterhat b60b0a95aa you ever just forget that if statements exist 2020-02-16 02:28:12 -06:00
Hatterhat 40f7069480 tgstation 42495 - the one that makes more mechs take stock parts (#11011)
* i think i got everything

* so how about that one comma
2020-02-16 07:48:22 +01:00
Trilbyspaceclone 21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
Trilbyspaceclone a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
kevinz000 14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
kevinz000 a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
Seris02 c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857)
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
2020-02-16 07:31:30 +01:00
Ghom abf7d2423a Update death.dm 2020-02-16 07:17:53 +01:00
Persi 18feba7fdd Defusal kits are now emag only and don't require a drop pod console. 2020-02-16 00:14:15 -05:00
Persi 23a9b9b438 Master got fixed while I was at work! 2020-02-16 00:07:24 -05:00
Seris02 fb4e4bcfce makes spraycans rely on HSL lightness instead of an addition of all the RGB values 2020-02-16 12:05:38 +08:00
kevinz000 938d87cfba Update stunbaton.dm 2020-02-15 17:28:04 -07:00