shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,690 Commits 5 Branches 0 Tags
6d65fd87149fa1a0298f98bc4e07b400a761da14
Commit Graph

267 Commits

Author SHA1 Message Date
deathride58
1d8618eaca Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090 
[MIRROR] Cleans up goldcore defines
 2017-11-27 03:11:42 +00:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
Mark9013100
fb4787fbd1 Oldstation edits/fixes (#33080) 2017-11-26 00:01:21 -06:00
deathride58
14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994 
[MIRROR] Updates some item drops to use drop_location()
 2017-11-25 05:53:16 +00:00
deathride58
cf053af319 Update pandemic.dm 2017-11-24 18:50:23 -05:00
deathride58
754490a2d3 Update pandemic.dm 2017-11-24 18:02:51 -05:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
ShizCalev
831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJay
9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482 
[MIRROR] Improves the deep fryer
 2017-11-15 11:13:56 -06:00
LetterJay
37085ee10e Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723 
[MIRROR] Makes cryoxadone heal clone damage again
 2017-11-15 10:40:13 -06:00
LetterJay
1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
LetterJay
2d137b2bf9 Update medicine_reagents.dm 2017-11-14 15:51:58 -06:00
Jordan Brown
c3a4d0d06a Makes cryoxadone heal clone damage again 2017-11-14 05:01:17 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597 
[MIRROR] Fixes stimulum decay
 2017-11-13 11:45:00 -06:00
LetterJay
9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582 
[MIRROR] Fixes 512 compile reminders
 2017-11-13 11:42:40 -06:00
Ashe Higgs
9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
AnturK
d987dcdda8 Fixes stimulum decay (#32597) 
* Fixes stimulum decay

* Nitryl too

* This too.

* Makes stimulum actually apply it's anti-stun changes.
 2017-11-12 15:33:20 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Emmett Gaines
95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -06:00
Leo
c11dc9d20f Merge pull request #32560 from Mark9013100/11/9/17_char_antitox 
Renames charcoal bottles
 2017-11-10 09:10:41 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
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
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -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