shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,301 Commits 5 Branches 0 Tags
c8ec3d8e510bd7dd5e05404547b6c8a2681e9882
Commit Graph
149 Commits
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 159fe41ab8 Merge pull request #33948 from ShizCalev/abstract-frying 
stops frying abstract or nodrop items
 2017-12-31 10:01:38 -06:00
LetterJayandGitHub 3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJayandGitHub 5e0ddfce60 Update drinks.dm 2017-12-19 17:15:37 -06:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
LetterJayandGitHub 6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598 
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
 2017-12-18 15:26:42 -06:00
Ashe HiggsandCitadelStationBot 5b107f3922 Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking (#33598) 
* Stops microwave sound loops when it should

* rogue sound!
 2017-12-17 16:16:17 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Ashe HiggsandCitadelStationBot 2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58andGitHub c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361 
[MIRROR] Removes juicers
 2017-12-10 23:49:41 +00:00
deathride58andGitHub e46e6dcd1a Delete juicer.dm 2017-12-10 18:06:19 -05:00
deathride58andGitHub 4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
orangesandCitadelStationBot 10d50dd283 Fixes mugs being called "broken bottles" 2017-12-08 10:34:27 -06:00
Emmett GainesandCitadelStationBot 8c11252d93 butterdogs (#33002) 2017-11-25 15:35:21 -06:00
deathride58andGitHub 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
deathride58andGitHub 44fb7ccdb7 Update drinkingglass.dm 2017-11-24 18:00:44 -05:00
ShizCalevandCitadelStationBot 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
orangesandCitadelStationBot c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
ShizCalevandCitadelStationBot 6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
deathride58andGitHub 0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 
[MIRROR] Refactor of catpeople mutant organs
 2017-11-21 21:16:31 +00:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58andGitHub 2abd06e25e Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862 
[MIRROR] Rat Kebabs
 2017-11-21 04:39:41 +00:00
ShizCalevandCitadelStationBot 831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
JordieandCitadelStationBot f162a48472 Rat Kebabs 2017-11-19 22:49:46 -06:00
Tad HardestyandCitadelStationBot 3914765c70 Fix runtimes when stacking pizza boxes (#32831) 2017-11-18 13:51:01 -06:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJay 668248b987 combines the missed microwave PR 2017-11-15 10:31:41 -06:00
LetterJayandGitHub 7aea98f749 Update meat.dm 2017-11-14 13:40:58 -06:00
Ashe HiggsandCitadelStationBot 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
LetterJayandGitHub 94bdcb6848 Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556 
[MIRROR] Fixed teleporting food out of the deep fryer
 2017-11-12 08:20:10 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Jordan BrownandCitadelStationBot b6e7e8501d Merge pull request #32556 from Cruix/deep_fryer 
Fixed teleporting food out of the deep fryer
 2017-11-09 23:21:59 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
vuonojenmustaturskaandCitadelStationBot cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406) 
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
 2017-11-05 04:32:07 -06:00
ACCountandCitadelStationBot eb54055278 Refactor of catpeople mutant organs 2017-11-01 21:38:06 -05:00
vuonojenmustaturskaandCitadelStationBot 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
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa 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
MercenaryblueandCitadelStationBot 06ea404a28 Prevent creampie overlays from stacking. 2017-10-17 03:48:45 -05:00
Jordan BrownandCitadelStationBot bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00