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

6514 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
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
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
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
1fbff5f83b23d39d38b1dfcb4cac8d9b
d3c7dd3802 Fix recycling the same assembly multiple times (#38275) 2018-06-05 04:13:44 -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
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
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
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
Tad Hardesty
9f4f470607 Delay smoothing atoms that have not initialized yet (#38173) 2018-06-03 14:25:35 -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
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
Jordie
d8113dfc99 Fixes datediff not returning (#38215) 2018-06-03 09:04:16 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
cyclowns
bd25d809c3 Fixes tritium and plasma fires storing cached_results incorrectly (#38230) 
* id -> "fire"

* testing remnant
 2018-06-03 09:03:33 -05:00
Nich
b38f42f989 Fixes a locate and adds job checks to download objective (#38199) 2018-06-03 09:03:23 -05:00
kevinz000
217dfc0d53 Fixes exploit (#38250) 2018-06-03 09:03:15 -05:00
Tad Hardesty
95bbfb29d1 Fix mecha mouse pointer issues (#38213) 
* Fix mecha mouse pointer issues

* Migrate ranged ability mouse pointers to new system
 2018-06-03 09:03:06 -05:00
Ling
49bd6e24fb Fixes pda style loading 2018-06-03 09:02:42 -05:00
LetterJay
5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175 
[MIRROR] Removes drone overlays and the associated code
 2018-06-02 07:45:00 -05:00
LetterJay
55720bd218 Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170 
[MIRROR] Fixed the clockwork helmet not dropping to the ground when used by a non-clock cultist like the other clock armor pieces do.
 2018-06-02 07:32:31 -05:00
LetterJay
8d8db8d2fe Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091 
[MIRROR] EMPs no longer pulse internal silicon wires
 2018-06-02 07:32:11 -05:00
LetterJay
3af17b9f7c Merge pull request #6972 from Citadel-Station-13/upstream-merge-38185 
[MIRROR] Set cult floor effects to be on the floor plane
 2018-06-02 07:28:56 -05:00
LetterJay
91351e1f1f Merge pull request #6970 from Citadel-Station-13/upstream-merge-38172 
[MIRROR] allows changing the rank of players in the playerpanel
 2018-06-02 07:28:31 -05:00
LetterJay
321df15afd Merge pull request #6969 from Citadel-Station-13/upstream-merge-38195 
[MIRROR] Fix infinite soapstone uses exploit
 2018-06-02 07:28:08 -05:00
LetterJay
97a31c283b Merge pull request #6963 from Citadel-Station-13/upstream-merge-38158 
[MIRROR] Fix: Cyborgs can now use defibs with other modules equipped
 2018-06-02 07:23:42 -05:00
LetterJay
d751cb619a Merge pull request #6966 from Citadel-Station-13/upstream-merge-38191 
[MIRROR] Stock parts sorter now use get_parts_rating
 2018-06-02 07:22:21 -05:00
LetterJay
228a88e442 Merge pull request #6957 from Citadel-Station-13/upstream-merge-38160 
[MIRROR] Fix rank changing with legacy only rank loading
 2018-06-02 07:20:24 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
theo2003
d45724f12b Fixed the clockwork helmet so it drops to the ground when used by a non-clock cultist like the other clock armor does. 2018-06-01 10:20:40 -05:00
kevinz000
308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
Jordan Brown
876e8ec713 Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors 
Set cult floor effects to be on the floor plane
 2018-06-01 09:50:58 -05:00
Nich
3b6e5236bf allows changing the rank of players in the playerpanel (#38172) 
* allows changing the rank of players in the playerpanel

* Update permissionedit.dm

* Update permissionedit.dm
 2018-06-01 08:26:25 -05:00