shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,969 Commits 5 Branches 0 Tags
2e2e1cb1bfbfd7f7d3574f9be92e4e8af8665a91
Commit Graph
172 Commits
Author SHA1 Message Date
ShizCalevandCitadelStationBot 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
deathride58andGitHub 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
vuonojenmustaturskaandCitadelStationBot 6bdb3ad4c0 Merge pull request #35594 from praisenarsie/patch-30 
Fixes rat kebabs
 2018-02-13 17:15:31 -06:00
orangesandCitadelStationBot e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalevandCitadelStationBot f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan BrownandCitadelStationBot bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions 
Fixed chemical recipe conflicts
 2018-02-10 11:04:34 -06:00
Jordan BrownandCitadelStationBot 5082056ef9 Merge pull request #35452 from 81Denton/crush-a-can-for-jay-owen 
Removes grind_results from empty soda cans
 2018-02-09 12:48:59 -06:00
Ashe HiggsandCitadelStationBot cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -06:00
CitadelStationBotandPoojawa 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBotandPoojawa 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260) 
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
 2018-02-05 03:00:22 -06:00
CitadelStationBotandPoojawa ee0245c79f [MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226) 
* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
 2018-02-04 22:07:17 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
uraniummeltdownandCitadelStationBot f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
vuonojenmustaturskaandCitadelStationBot f005e65ab0 Merge pull request #35018 from DaxDupont/rice-pudding 
Rice (pudding) is no longer a salad.
 2018-01-28 11:34:14 -06:00
Jordan BrownandCitadelStationBot 2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length 
fixes pancake runtimes
 2018-01-26 03:00:24 -06:00
MrDoomBringerandCitadelStationBot 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Jordan BrownandCitadelStationBot 0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo 
Fixes spider reagents typo
 2018-01-20 09:48:44 -06:00
Jordan BrownandCitadelStationBot 93cc10b7a0 Merge pull request #34627 from ShizCalev/pie-runtime 
Fixes pie runtime
 2018-01-19 08:58:37 -06:00
Jordan BrownandCitadelStationBot 594e8c8e6d Merge pull request #34553 from ShizCalev/abstract-transfertoloc 
Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 16:48:32 -06:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
orangesandCitadelStationBot 6012a5c6eb Fix bug with smashing bottles on throw (#34077) 
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
 2018-01-05 06:01:44 -06:00
deathride58 5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
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