shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,385 Commits 5 Branches 0 Tags
32b91ef798d227201992cc273bf59984629e460a
Commit Graph
17385 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 32b91ef798 Automatic changelog generation for PR #7021 [ci skip] 2018-06-06 01:14:50 -05:00
CitadelStationBotandkevinz000 a298f20fa5 [MIRROR] [s] Fixes syndicate sentience exploit (#7021) 
* Fixes syndicate sentience exploit (#38299)

* [s] Fixes syndicate sentience exploit
 2018-06-05 23:14:48 -07:00
CitadelStationBot 286de1b966 Automatic changelog generation for PR #6868 [ci skip] 2018-06-06 01:12:57 -05:00
LetterJayandkevinz000 fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868) 
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
 2018-06-05 23:12:55 -07:00
CitadelStationBot 7893cb360e Automatic changelog generation for PR #6960 [ci skip] 2018-06-05 18:38:57 -05:00
deathride58andGitHub aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165 
[MIRROR] Adds config for monkey cap
 2018-06-05 23:38:54 +00:00
CitadelStationBot 93488e81da Automatic changelog generation for PR #6971 [ci skip] 2018-06-05 18:37:40 -05:00
deathride58andGitHub 98fa9db020 Merge pull request #6971 from Citadel-Station-13/upstream-merge-38179 
[MIRROR] Fix Pubby auxiliary mining base
 2018-06-05 23:37:37 +00:00
CitadelStationBot 129971c6ba Automatic changelog generation for PR #6979 [ci skip] 2018-06-05 18:37:22 -05:00
deathride58andGitHub bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 
[MIRROR] Refactor machinery to default to being anchored
 2018-06-05 23:37:20 +00:00
CitadelStationBot da008a2d83 Automatic changelog generation for PR #7019 [ci skip] 2018-06-05 18:36:39 -05:00
deathride58andGitHub cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193 
[MIRROR] Turns /datum.isprocessing into a datum flag
 2018-06-05 23:36:37 +00:00
CitadelStationBot ebe0695af3 Automatic changelog generation for PR #7020 [ci skip] 2018-06-05 18:36:24 -05:00
deathride58andGitHub 629c4a649c Merge pull request #7020 from Citadel-Station-13/upstream-merge-38290 
[MIRROR] Admin Supplypod tweaks (Behaves like fireballs, also stuns targets)
 2018-06-05 23:36:22 +00:00
letterjay 9535ef1a1f Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) 2018-06-05 18:02:36 -05:00
MrDoomBringerandletterjay 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
letterjay d397b3ab94 Turns /datum.isprocessing into a datum flag 2018-06-05 18:00:21 -05:00
vuonojenmustaturskaandletterjay 83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58andGitHub b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
deathride58andGitHub 255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
deathride58andGitHub b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
CitadelStationBot 3489ed23c6 Automatic changelog generation for PR #6983 [ci skip] 2018-06-05 16:23:56 -05:00
deathride58andGitHub 963ad5dce9 Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238 
[MIRROR] Fixes pda style loading
 2018-06-05 21:23:53 +00:00
CitadelStationBot 93d43c1d50 Automatic changelog generation for PR #7015 [ci skip] 2018-06-05 16:04:18 -05:00
deathride58andGitHub 79d304eeb7 Merge pull request #7015 from Citadel-Station-13/upstream-merge-38283 
[MIRROR] Stops swarmers from attacking field gens/turret covers
 2018-06-05 21:04:15 +00:00
deathride58andGitHub 2b02092639 Update preferences.dm 2018-06-05 17:03:55 -04:00
CitadelStationBot b2bc6dc213 Automatic changelog generation for PR #7016 [ci skip] 2018-06-05 15:52:06 -05:00
deathride58andGitHub d92f976917 Merge pull request #7016 from Citadel-Station-13/upstream-merge-38268 
[MIRROR] [Ready] Arcade reward: snack rigs
 2018-06-05 20:52:03 +00:00
deathride58andGitHub 71d68a7284 Merge pull request #7017 from Citadel-Station-13/upstream-merge-38284 
[MIRROR] Blacklist ion trails from chasms
 2018-06-05 20:51:42 +00:00
letterjay c42819368f Blacklist ion trails from chasms 2018-06-05 13:29:53 -05:00
81Dentonandletterjay 9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
letterjay 0885986bba [Ready] Arcade reward: snack rigs 2018-06-05 13:27:39 -05:00
81Dentonandletterjay 2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05:00
CitadelStationBotandkevinz000 de73153ccb [MIRROR] Fixes uplink refunds (#7014) 
* Fixes uplink refunds (#38272)

* Fixes uplink refunds

* Whoops

* Sure

* Fixes uplink refunds
 2018-06-05 11:19:33 -07:00
CitadelStationBot 6a6407881c Automatic changelog generation for PR #7012 [ci skip] 2018-06-05 13:18:30 -05:00
CitadelStationBotandkevinz000 eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012) 
* Fix inconsistent energy gun suicide (#38252)

* Fix inconsistent energy gun suicide
 2018-06-05 11:18:27 -07:00
CitadelStationBot fbe49fece0 Automatic changelog generation for PR #7013 [ci skip] 2018-06-05 13:17:49 -05:00
CitadelStationBotandkevinz000 74aeecca6d [MIRROR] Fix the Lightning Bolt spell (#7013) 
* Fix the Lightning Bolt spell (#38253)

* Fix the Lightning Bolt spell
 2018-06-05 11:17:47 -07:00
letterjay 1b84899d2a Stops swarmers from attacking field gens/turret covers 2018-06-05 13:17:13 -05:00
81Dentonandletterjay a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 2018-06-05 13:17:12 -05:00
CitadelStationBotandkevinz000 0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
CitadelStationBot 36357a4274 Automatic changelog generation for PR #7006 [ci skip] 2018-06-05 13:16:19 -05:00
deathride58andkevinz000 4076078210 Adds table slamming as a right click interaction for tables (#7006) 
* Adds table slamming as a right click interaction for tables

* and the DME, too. fuck.

* fixes compiling errors
 2018-06-05 11:16:17 -07:00
CitadelStationBot 8a971eaa06 Automatic changelog generation for PR #7005 [ci skip] 2018-06-05 13:15:53 -05:00
deathride58andkevinz000 1042fa8ff1 Adds @CitadelBot wheelofsalt command (#7005) 
* adds the wheel of salt chat command to tgs3

* fuck i missed a couple things
 2018-06-05 11:15:51 -07:00
LetterJayandGitHub 5bad5f30c4 Merge pull request #7010 from Citadel-Station-13/upstream-merge-38267 
[MIRROR] Adds missing minerals to /everything closet
 2018-06-05 12:11:57 -05:00
LetterJayandGitHub d9cf74ce5e Merge pull request #7009 from Citadel-Station-13/upstream-merge-38275 
[MIRROR] Fixes recycling the same assembly multiple times
 2018-06-05 12:11:47 -05:00
CitadelStationBot 70e1f9d27d Automatic changelog generation for PR #6995 [ci skip] 2018-06-05 12:11:37 -05:00
LetterJayandGitHub 5997b69de1 Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240 
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
 2018-06-05 12:11:34 -05:00
LetterJayandGitHub b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223 
[MIRROR] Slight changes to camera network code
 2018-06-05 12:11:19 -05:00