shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,656 Commits 5 Branches 0 Tags
fc04d94a293342355a2a00a26fcd186b2000e072
Commit Graph

237 Commits

Author SHA1 Message Date
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
FrozenGuy5
adca482008 Nerfs smoke machine + improves grammar (#32196) 
* https is the way to go

* changes links to https:// instead of http://

* tsk tsk byond

* Nerfs smoke machine + improves grammar

* requested changes

* i can spell
 2017-10-31 15:19:08 -05:00
LetterJay
09a198fb65 Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225 
[MIRROR] Deterministic output slots for smartfridges
 2017-10-30 23:32:39 -04:00
vuonojenmustaturska
5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
PKPenguin321
e486038c2e Fixes filling smoke machines with pills (#32140) 
Fixes #32102

Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
 2017-10-29 16:01:34 -05:00
LetterJay
f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864 
[MIRROR] Makes thermite a component
 2017-10-29 04:23:16 -04:00
LetterJay
13891ec34b Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107 
[MIRROR] Adds some new grindables to the grinder
 2017-10-29 03:46:19 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
Anonmare
79e69cbd36 Adds some new grindables to the grinder (#32107) 
* Adds some new grindables to the grinder

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Adds the extra ")"

* Update reagentgrinder.dm
 2017-10-27 17:30:08 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
KorPhaeron
9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -05:00
kevinz000
f4bac0619b fixes pentetic acid dealing radiation damage instead of healing it (#32027) 
* Update medicine_reagents.dm

* sorry i alughed so hard i hit a key
 2017-10-24 10:55:21 -05:00
vuonojenmustaturska
1930e5cf84 Fixes grinders (#31885) 
* But you're still hungry

* Update reagentgrinder.dm
 2017-10-23 08:22:17 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
2ac880c5fc [MIRROR] Spraytan Nerf (#3528) 
* Spraytan Nerf

* Spraytan Nerf
 2017-10-21 06:11:04 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
51b87c4921 [MIRROR] switch smoke machine general logging from admin to game log (#3527) 
* switch smoke machine general logging from admin to game log, where it should be -- i missed this when i added the message_admins call

* switch smoke machine general logging from admin to game log
 2017-10-21 03:46:41 -05:00
LetterJay
96e8196175 Merge pull request #3481 from Citadel-Station-13/upstream-merge-31839 
[MIRROR] Rewords networked fibers description
 2017-10-19 09:02:50 -04:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Leo
c3b7b324e4 Merge pull request #31839 from ShizCalev/networked-fibers-grammar 
Rewords networked fibers description
 2017-10-18 07:23:20 -05:00
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04:00
LetterJay
5bfabefc84 Merge pull request #3466 from Citadel-Station-13/upstream-merge-31806 
[MIRROR] Fixes for Smoke Machine Fixes
 2017-10-18 07:35:46 -04:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Robustin
d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -05:00
LetterJay
8ae369bf77 Update bottle.dm 2017-10-16 07:54:02 -05:00
LetterJay
448e2d9448 Update medicine_reagents.dm 2017-10-16 07:53:50 -05:00
vuonojenmustaturska
11eff73897 Removes hardcoded "full bottle" icons from several pre-filled reagent bottles 2017-10-16 00:00:52 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731 
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
 2017-10-15 10:20:04 -04:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
vuonojenmustaturska
1831bc8ea9 Allows mobs to get shocked when they smash things (#31677) 
also fixes an unrelated runtime involving magillitis
 2017-10-14 15:19:37 -05:00
LetterJay
2d32e5f782 Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693 
[MIRROR] FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
 2017-10-14 15:38:10 -04:00
LetterJay
45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJay
dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598 
[MIRROR] Smoke Machine Updates & Fixes
 2017-10-14 10:21:09 -04:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
oranges
5fdaba2b0e Merge pull request #31693 from Armhulen/patch-12 
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
 2017-10-13 23:49:54 -05:00
Robustin
4100473aba Smoke Machine Updates & Fixes (#31598) 
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
 2017-10-13 16:50:32 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown
ca4907b881 Merge pull request #31582 from feemjmeem/smoke-log-announcing 
Notify admins when someone activates a smoke machine
 2017-10-12 16:03:50 -05:00
LetterJay
56f7bcddcc Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443 
[MIRROR] Fixes pandemic no beaker UI runtime
 2017-10-10 22:33:33 -04:00