Commit Graph

30422 Commits

Author SHA1 Message Date
Ghommie
ee1f61b5de F 2020-02-19 14:26:11 +01:00
Ghommie
057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie
37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
CitadelStationBot
991f04877a Automatic changelog generation for PR #11114 [ci skip] 2020-02-17 09:17:30 -06:00
Ghom
b9b7e27bcb Merge pull request #11114 from Psody-Mordheim/Plzgibsynthflesh
Revenge Of Synthflesh : Electric Boogalo Part 2
2020-02-17 16:17:27 +01:00
CitadelStationBot
5b7c376893 Automatic changelog generation for PR #11108 [ci skip] 2020-02-17 06:45:25 -06:00
Ghom
5c60994572 Merge pull request #11108 from Seris02/hslshit
makes spraycans rely on HSL lightness instead of an addition of all the RGB values
2020-02-17 13:45:23 +01:00
CitadelStationBot
7a1eec5622 Automatic changelog generation for PR #11053 [ci skip] 2020-02-17 06:29:54 -06: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
CitadelStationBot
de75d75519 Automatic changelog generation for PR #11090 [ci skip] 2020-02-17 05:47:22 -06: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
Putnam3145
55070f7655 Merge pull request #11125 from Citadel-Station-13/Ghommie-patch-2
Something about box engine.
2020-02-16 16:28:43 -08:00
Ghom
66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
CitadelStationBot
0f12540748 Automatic changelog generation for PR #11101 [ci skip] 2020-02-16 17:08:13 -06: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
CitadelStationBot
688dcaf54e Automatic changelog generation for PR #11060 [ci skip] 2020-02-16 13:20:59 -06: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
CitadelStationBot
d9e9714038 Automatic changelog generation for PR #11120 [ci skip] 2020-02-16 13:05:53 -06: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
CitadelStationBot
63921b7c8b Automatic changelog generation for PR #11093 [ci skip] 2020-02-16 12:36:44 -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
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
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
CitadelStationBot
006e05fa34 Automatic changelog generation for PR #10704 [ci skip] 2020-02-16 06:10:22 -06:00
kevinz000
379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
Seris02
788a9f5b59 WOOPS 2020-02-16 16:39:35 +08:00
CitadelStationBot
d4072e3e1a Automatic changelog generation for PR #11011 [ci skip] 2020-02-16 00:48:25 -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
CitadelStationBot
d6b7e19ee8 Automatic changelog generation for PR #11028 [ci skip] 2020-02-16 00:46:48 -06:00
Trilbyspaceclone
21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
CitadelStationBot
1ca3d75ebd Automatic changelog generation for PR #11105 [ci skip] 2020-02-16 00:39:59 -06:00
Trilbyspaceclone
a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
CitadelStationBot
128eeefcaf Automatic changelog generation for PR #10970 [ci skip] 2020-02-16 00:37:27 -06:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
CitadelStationBot
475fc0c913 Automatic changelog generation for PR #10949 [ci skip] 2020-02-16 00:36:53 -06:00
kevinz000
a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
CitadelStationBot
af33ad1090 Automatic changelog generation for PR #10857 [ci skip] 2020-02-16 00:31:33 -06: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
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
828a339473 Merge pull request #11106 from Trilbyspaceclone/catfixesathing
Test, fixing master
2020-02-15 17:21:56 -07:00
TrilbySpaceClone
cba6667332 it could work 2020-02-15 18:42:50 -05:00
keronshb
3b9f9d7a16 Requested changes
Requested changes
2020-02-15 18:15:41 -05:00
kevinz000
36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572
Something about a couple runtimes.
2020-02-15 12:19:50 -07:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
2020-02-15 12:17:02 -07:00