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

10890 Commits

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
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
MrDoomBringer
71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -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
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
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
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
81Denton
9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -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
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
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
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
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
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
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
1fbff5f83b23d39d38b1dfcb4cac8d9b
d3c7dd3802 Fix recycling the same assembly multiple times (#38275) 2018-06-05 04:13:44 -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
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
MrDoomBringer
678e429dbf Adds a Supplypod-delivery admin smite (#38069) 
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
 2018-06-04 00:37:24 -05:00
deathride58
8157233145 Update airlock_control.dm 2018-06-03 22:19:52 -04:00
deathride58
a57bda822b Update game_options.dm 2018-06-03 22:19:13 -04:00
LetterJay
896eb8cacb Merge pull request #7004 from Citadel-Station-13/upstream-merge-38257 
[MIRROR] Fixes some advanced disease thresholds
 2018-06-03 16:23:58 -05:00
LetterJay
a8eaaff8e7 Merge pull request #7003 from Citadel-Station-13/upstream-merge-38173 
[MIRROR] Delay smoothing atoms that have not initialized yet
 2018-06-03 16:23:48 -05:00
LetterJay
37ff8a616d Merge pull request #7002 from Citadel-Station-13/upstream-merge-38225 
[MIRROR] Include item overlays in attack animations (shows the proper color of screwdrivers etc)
 2018-06-03 16:22:30 -05:00
LetterJay
9c4d7ca029 Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228 
[MIRROR] we can stop using getFlatIcon?
 2018-06-03 16:22:09 -05:00
LetterJay
5cb9495b84 Merge pull request #7000 from Citadel-Station-13/upstream-merge-38246 
[MIRROR] Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device.
 2018-06-03 16:21:53 -05:00
LetterJay
2c6c5bc5d2 Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249 
[MIRROR] Fixes comms consoles thinking the transit is on centcom
 2018-06-03 16:21:19 -05:00
LetterJay
a3167c00fa Merge pull request #6993 from Citadel-Station-13/upstream-merge-38215 
[MIRROR] Fixes datediff not returning
 2018-06-03 16:20:12 -05:00
LetterJay
8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220 
[MIRROR] Fixes pocket items being deleted when monkeyizing
 2018-06-03 16:19:36 -05:00
LetterJay
a8274810ab Merge pull request #6991 from Citadel-Station-13/upstream-merge-38218 
[MIRROR] Fixes cigar bugs
 2018-06-03 16:19:16 -05:00
Yenwodyah
6791d13e81 Fix some advanced disease thresholds (#38257) 2018-06-03 15:47:20 -05:00
Tad Hardesty
9f4f470607 Delay smoothing atoms that have not initialized yet (#38173) 2018-06-03 14:25:35 -05:00
vuonojenmustaturska
568dfa7f35 Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225) 
* overlay attacks

* this works too

* fix trays too
 2018-06-03 13:25:19 -05:00
vuonojenmustaturska
f83dc08fa7 are we free? (#38228) 2018-06-03 13:21:03 -05:00
theo2003
805852e1df Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246) 2018-06-03 12:59:27 -05:00
vuonojenmustaturska
83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
81Denton
0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
LetterJay
ae3f3cd741 Merge pull request #6988 from Citadel-Station-13/upstream-merge-38230 
[MIRROR] Fixes tritium and plasma fires storing cached_results incorrectly
 2018-06-03 10:44:51 -05:00
LetterJay
73d1abed5c Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199 
[MIRROR] fixes a locate and adds job checks to download objective
 2018-06-03 10:42:27 -05:00
LetterJay
7b7420dec6 Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250 
[MIRROR] [s]Fixes bloodcult exploit
 2018-06-03 10:42:16 -05:00
LetterJay
2e1d2c9736 Merge pull request #6985 from Citadel-Station-13/upstream-merge-38213 
[MIRROR] Fix mecha mouse pointer issues
 2018-06-03 10:41:39 -05:00
Jalleo
d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
Jordie
d8113dfc99 Fixes datediff not returning (#38215) 2018-06-03 09:04:16 -05:00