Commit Graph
12977 Commits
Author SHA1 Message Date
kevinz000andGitHub ed36aae74b Merge pull request #11112 from necromanceranne/mech-revival
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
2020-02-18 02:18:57 -07:00
kevinz000andGitHub c1df5d5313 Merge pull request #11111 from Ghommie/Ghommie-cit582
Virology support for synthetic blood and some blood subtypes removal.
2020-02-18 02:18:03 -07:00
kevinz000andGitHub 918618831c Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3
Something about gibs and mob biotypes.
2020-02-18 02:17:32 -07:00
kevinz000andGitHub 84633e7fe4 Merge pull request #11104 from Trilbyspaceclone/patch-288
Maybe makes Express console log their buying habits
2020-02-18 02:13:53 -07:00
kevinz000andGitHub 43b9875bbd Merge pull request #11119 from Ghommie/Ghommie-cit584
Something about consistency and magnetic rifles.
2020-02-18 02:12:51 -07:00
kevinz000andGitHub d6fe0df7ac Update pai.dm 2020-02-18 02:10:03 -07:00
kevinz000andGitHub 9264163d93 Update pai.dm 2020-02-18 01:47:20 -07:00
kevinz000andGitHub 6a97006b12 Update pai_defense.dm 2020-02-18 01:41:28 -07:00
kevinz000andGitHub 9dbc6ca183 Update client_procs.dm 2020-02-17 22:37:58 -07:00
Winter Flare ed46d3ca1c Typo 2020-02-18 00:37:28 -05:00
Winter Flare 1a994e7f1e Ports Broom, Tweak Janitor Vendor
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
BlueWildroseandGitHub 78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
Cameron!andGitHub a9f103fb34 removes unused bottle, kicks travis? 2020-02-17 15:28:10 -08:00
TrilbyspacecloneandGitHub 8f653b4dd6 Update materials.dm 2020-02-17 15:48:31 -05:00
3b82e34db6 Update code/modules/cargo/packs/emergency.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-17 15:48:02 -05:00
GhomandGitHub b9b7e27bcb Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
GhomandGitHub eddefd4d25 Update large_objects.dm 2020-02-17 15:07:17 +01:00
Seris02 217661184d nerf'd 2020-02-17 21:29:34 +08:00
Ghommie 5dc271124a Something about tesla revolvers and tk. 2020-02-17 14:29:14 +01:00
GhomandGitHub a2583f5f7f Update expressconsole.dm 2020-02-17 14:25:50 +01:00
GhomandGitHub 5e10f822e6 Update energy.dm 2020-02-17 13:40:37 +01:00
Cameron!andGitHub 28a589d2d1 diethylamine > ammonia 2020-02-17 04:32:39 -08:00
GhomandGitHub 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
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
Cameron!andGitHub 78fad64d56 this is no longer necessary 2020-02-16 15:54:41 -08:00
Cameron!andGitHub a4a5efbc11 ghommble's other changes 2020-02-16 15:48:22 -08:00
kevinz000andGitHub 262b4d95fb Update projectile.dm 2020-02-16 16:44:29 -07:00
Cameron!andGitHub 3ecd1b75d4 ghommald's changes 2020-02-16 15:32:05 -08:00
TrilbyspacecloneandGitHub c5eaac62bd Update materials.dm 2020-02-16 18:26:22 -05:00
TrilbyspacecloneandGitHub 0315802330 Update armory.dm 2020-02-16 18:25:54 -05:00
Ghommie aba636a44c ok 2020-02-17 00:13:16 +01:00
LinandGitHub 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
TrilbyspacecloneandGitHub 0f7618b348 Update organic.dm 2020-02-16 14:07:00 -05:00
LinandGitHub a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06: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
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
kevinz000andGitHub 379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
CameronWoof 14e41e8d68 adds diethylamine and saltpetre to the biogenerator 2020-02-16 03:52:07 -08: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
TrilbyspacecloneandGitHub 21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
TrilbyspacecloneandGitHub a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
kevinz000andGitHub 14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00