shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,370 Commits 5 Branches 0 Tags
bdef4e4e77491069087dbeaf1ddd7f36e1a45ac9
Commit Graph

17370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
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
deathride58
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
deathride58
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
MrDoomBringer
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
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
81Denton
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
81Denton
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
81Denton
a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 2018-06-05 13:17:12 -05:00
CitadelStationBot
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
deathride58
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
deathride58
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
eac5206e51 Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077 
[MIRROR] Antag reputation rewards are now configurable
 2018-06-05 12:10:07 -05:00
letterjay
08524b71dd Adds missing minerals to /everything closet 2018-06-05 04:13:56 -05:00
81Denton
1778c97eeb Adds missing minerals to /everything closet (#38267) 
* adds bs/ayy minerals to everything closet

* plastic+wood
 2018-06-05 04:13:56 -05:00
letterjay
b4a982f287 Fixes recycling the same assembly multiple times 2018-06-05 04:13:45 -05:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
d3c7dd3802 Fix recycling the same assembly multiple times (#38275) 2018-06-05 04:13:44 -05:00
CitadelStationBot
495f0e0749 Automatic changelog generation for PR #7008 [ci skip] 2018-06-04 07:55:39 -05:00
LetterJay
72dd7cc3a5 Merge pull request #7008 from Citadel-Station-13/upstream-merge-38262 
[MIRROR] New directional beach sprites and corners for the 2018 Summer Ball
 2018-06-04 07:55:36 -05:00
CitadelStationBot
65d1bd417a Automatic changelog generation for PR #7007 [ci skip] 2018-06-04 07:55:20 -05:00
LetterJay
740dbf1ef7 Merge pull request #7007 from Citadel-Station-13/upstream-merge-38069 
[MIRROR] Adds a Supplypod-delivery admin smite [shh its all good]
 2018-06-04 07:55:17 -05:00
letterjay
c21de57cab New directional beach sprites and corners for the 2018 Summer Ball 2018-06-04 00:47:46 -05:00
CitrusGender
bd6fb5f9e5 New directional beach sprites and corners for the 2018 Summer Ball (#38262) 
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.

* SOMEONE LIED TO ME

* Update misc_plating.dm

* don't copy paste at 4am

* okay there we go
 2018-06-04 00:47:45 -05:00