shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,140 Commits 5 Branches 0 Tags
b6dabb16407c776c04cc085949e07b74eb1895e8
Commit Graph
121 Commits
Author SHA1 Message Date
LetterJayandGitHub 9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598 
[MIRROR] Adds grenadine.
 2018-05-23 22:26:44 -05:00
LetterJayandGitHub db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJayandGitHub 204043bc26 Update borghydro.dm 2018-05-17 23:44:58 -05:00
ThePainkillerandletterjay e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Hyacinth-ORandCitadelStationBot 4a7f656823 Adds grenadine. 2018-05-02 13:13:29 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
CitadelStationBotandPoojawa 7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018) 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
 2018-03-19 22:17:05 -05:00
CitadelStationBotandPoojawa c91006c27f [MIRROR] Create ERT refactor (#5924) 
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
 2018-03-12 07:30:03 -05:00
CitadelStationBotandPoojawa 7273e4f142 [MIRROR] Makes space cleaner more efficient, reduces spraybottle volume (#5914) 
* Makes space cleaner more efficient, reduces spraybottle volume (#36228)

* Buffs janitor by making the space cleaner spray much more efficient

* bump volume to 100, shuffle some vars around

* Makes space cleaner more efficient, reduces spraybottle volume
 2018-03-12 07:06:36 -05:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBotandPoojawa 58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634) 
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
 2018-02-24 09:35:48 -06:00
CitadelStationBotandPoojawa 4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673) 
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
 2018-02-23 17:42:24 -06:00
CitadelStationBotandPoojawa 099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666) 
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
 2018-02-22 23:43:23 -06:00
AnturKandCitadelStationBot 73928eb9c0 Fixes patches runtime when applying to missing limbs. (#35845) 
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
 2018-02-21 11:41:51 -06:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
ShizCalevandCitadelStationBot 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBotandPoojawa b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
Poojawa a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
deathride58andGitHub a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
Jordan BrownandCitadelStationBot f2d75f1439 Merge pull request #34881 from Robustin/paxPK 
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 02:59:45 -06:00
ShizCalevandCitadelStationBot e4a96fe2cd Syringe update_icon sanity 2018-01-26 02:59:21 -06:00
MrDoomBringerandCitadelStationBot 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
ShizCalevandCitadelStationBot fb86cf6878 Fixes syringe icons (#34704) 2018-01-22 12:01:02 -06:00
deathride58andGitHub 257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360 
[MIRROR] Fixes clownborg sprays not recharging
 2018-01-13 20:29:01 +00:00
LeoandCitadelStationBot e8d21ac1f3 Merge pull request #34360 from kevinz000/patch-429 
Fixes clownborg sprays not recharging
 2018-01-13 13:25:24 -06:00
orangesandCitadelStationBot 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
deathride58 aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05: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 349b0f4f20 Update spray.dm 2017-12-19 17:19:05 -06:00
LetterJayandGitHub fdfdaa230a Update glass.dm 2017-12-19 17:18:27 -06:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
LetterJayandGitHub 3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -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
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
coiaxandCitadelStationBot 6846e87ae2 Silver slime extract foods now fry correctly (#33309) 
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
 2017-12-10 17:42:20 -06:00
deathride58 f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
Mark9013100andCitadelStationBot fb4787fbd1 Oldstation edits/fixes (#33080) 2017-11-26 00:01:21 -06:00
orangesandCitadelStationBot c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58 b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00