shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,178 Commits 5 Branches 0 Tags
2e461543446e83c1bf2dce435c8b5ca678e4c86f
Commit Graph
10178 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 2e46154344 Merge pull request #4324 from Citadel-Station-13/upstream-merge-33444 
[MIRROR] Changes captain glove description
 2017-12-11 16:24:05 +00:00
CitadelStationBot 3f7523217c Changes captain glove description 2017-12-11 08:59:36 -06:00
Jordan BrownandCitadelStationBot 04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
deathride58andGitHub c3441ec66a Merge pull request #4321 from Citadel-Station-13/upstream-merge-33434 
[MIRROR] Fixes integrated circuit reagent components not working while in mobs, adds new helper procs
 2017-12-11 03:19:53 +00:00
deathride58andGitHub 0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCountandCitadelStationBot a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
deathride58andGitHub 65cc4a2f16 Merge pull request #4102 from Citadel-Station-13/upstream-merge-33001 
[MIRROR] Adds a python script to load jsons to prevent any syntax error on them
 2017-12-11 01:18:08 +00:00
deathride58 11b7094dfa fUCK - fixes compiling errors for real i hope fuck 2017-12-10 20:08:33 -05:00
deathride58 cb6c0e190d fixes compiling error 2017-12-10 19:48:40 -05:00
CitadelStationBot bdcb0ecd6b Automatic changelog generation for PR #4254 [ci skip] 2017-12-10 18:46:02 -06:00
deathride58andGitHub 051b45c680 Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316 
[MIRROR] Adds games vendor resupply crate
 2017-12-11 00:46:00 +00:00
CitadelStationBot 8901b7dc22 Automatic changelog generation for PR #4272 [ci skip] 2017-12-10 18:41:07 -06:00
deathride58andGitHub 7e68709634 Merge pull request #4272 from Citadel-Station-13/upstream-merge-33342 
[MIRROR] [Box] Moves drone dispenser to Robotics maintenance
 2017-12-11 00:41:04 +00:00
CitadelStationBot d3448c7002 Automatic changelog generation for PR #4319 [ci skip] 2017-12-10 18:20:58 -06:00
deathride58andGitHub fdefdef3e7 Merge pull request #4319 from Citadel-Station-13/upstream-merge-33428 
[MIRROR] Small Rebalance to hardsuit's armor ratings
 2017-12-11 00:20:56 +00:00
deathride58andGitHub 71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424 
[MIRROR] Standardization of return_ordered_turfs
 2017-12-11 00:06:54 +00:00
deathride58andGitHub c211552c9d Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309 
[MIRROR] Silver slime extract foods now fry correctly
 2017-12-11 00:03:05 +00:00
deathride58andGitHub ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58 add4b774e5 fixes map conflicts 2017-12-10 19:00:08 -05:00
CitadelStationBot cad71813a3 Automatic changelog generation for PR #4241 [ci skip] 2017-12-10 17:55:37 -06:00
deathride58andGitHub 276a2c1015 Merge pull request #4241 from Citadel-Station-13/upstream-merge-33267 
[MIRROR] [Metastation] Moves drone dispenser to Robotics maint
 2017-12-10 23:55:35 +00:00
CitadelStationBot c6b7812b65 Automatic changelog generation for PR #4313 [ci skip] 2017-12-10 17:50:22 -06:00
deathride58andGitHub d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
CitadelStationBot 220f39718d Automatic changelog generation for PR #4240 [ci skip] 2017-12-10 17:50:07 -06:00
deathride58andGitHub cdc23ad79e Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265 
[MIRROR]  Good Clean Fun: A vending machine for games!
 2017-12-10 23:50:05 +00:00
CitadelStationBot 684ceb2aa8 Automatic changelog generation for PR #4315 [ci skip] 2017-12-10 17:49:53 -06:00
deathride58andGitHub 57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00: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 6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00:00
CitadelStationBot 0ad96321c7 Small Rebalance to hardsuit's armor ratings 2017-12-10 17:45:41 -06:00
FrozenGuy5andCitadelStationBot 9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
CitadelStationBot 5b6131d35d Standardization of return_ordered_turfs 2017-12-10 17:44:31 -06:00
Emmett GainesandCitadelStationBot 35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
CitadelStationBot 857b4d150d Silver slime extract foods now fry correctly 2017-12-10 17:42:20 -06: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 3a8c2b3be0 fixes map conflicts 2017-12-10 18:17:25 -05:00
LetterJayandGitHub 85578cae0d Merge pull request #4316 from deathride58/iconoverridefix 
Fixes icon_override only applying to uniforms
 2017-12-10 17:15:13 -06:00
deathride58 4b8c3f808e fixes map conflicts 2017-12-10 18:12:33 -05:00
deathride58andGitHub e46e6dcd1a Delete juicer.dm 2017-12-10 18:06:19 -05:00
CitadelStationBot e578bce878 Automatic changelog generation for PR #4259 [ci skip] 2017-12-10 17:04:36 -06:00
deathride58andGitHub 0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150 
[MIRROR] Makes actionbuttons remember positions where you locked them.
 2017-12-10 23:04:34 +00:00
deathride58andGitHub 1eb0e42bb1 Update uplink_devices.dm 2017-12-10 18:04:11 -05:00
deathride58andGitHub 6a8cffc3d5 Update implantuplink.dm 2017-12-10 18:03:04 -05:00
deathride58andGitHub 68d7347c02 Update white_ship.dm 2017-12-10 17:55:46 -05:00
deathride58 9d50222ef6 fixes merge conflicts 2017-12-10 17:54:20 -05:00
deathride58andGitHub bfa573f4bd Update alarmlock.dm 2017-12-10 17:46:50 -05:00
deathride58andGitHub 01c9cf6479 Update preferences.dm 2017-12-10 17:45:21 -05:00
CitadelStationBot 97588f6f69 Automatic changelog generation for PR #4250 [ci skip] 2017-12-10 16:44:01 -06:00
deathride58andGitHub 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
CitadelStationBot 6fd18b363c Automatic changelog generation for PR #4305 [ci skip] 2017-12-10 16:39:05 -06:00