shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,422 Commits 5 Branches 0 Tags
ee1f61b5de65dbe13faa74bfb235cded4c19c94b
Commit Graph

19610 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
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
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
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
66d5e0e346 Update station.dm 2020-02-17 01:03:29 +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
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
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
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
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
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
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
kevinz000
b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4 
/datum/element/cleaning cleans your face!
 2020-02-15 12:16:39 -07:00
kevinz000
f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 
Holopad static fix and a few other mistakes.
 2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
kevinz000
56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7 
Nerfing cargo passive points generation
 2020-02-15 12:15:31 -07:00
kevinz000
fc5eeeac00 Update gun.dm 2020-02-15 12:14:51 -07:00
kevinz000
eb33901046 Merge pull request #11002 from BlackMajor/walkerbois 
Makes the Ash Walker camp a static spawn in lavaland.
 2020-02-15 11:47:58 -07:00
kevinz000
957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 
Something about a couple stack trace issues.
 2020-02-15 11:47:30 -07:00
kevinz000
e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1 
Something about disposal bins and trash bags.
 2020-02-15 11:46:56 -07:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -07:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2 
Porting agent card updates and registered name fix.
 2020-02-15 11:45:39 -07:00
kevinz000
24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
kevinz000
fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282 
Buffs oats and makes meatwheat have rarity
 2020-02-15 11:44:52 -07:00
kevinz000
76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 
Further mob holder fixes.
 2020-02-15 11:44:25 -07:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Ghommie
72efdec3fb Porting pair pinpointers and fixing an edge case runtime. 2020-02-15 19:12:07 +01:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 
Blood Drunk Miner now uses a PKA
 2020-02-15 09:05:45 +01:00