shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,172 Commits 5 Branches 0 Tags
f8f278dfd58e6dfef752d3593ae474389fc429dd
Commit Graph

1768 Commits

Author SHA1 Message Date
LetterJay
0830e6907e Merge pull request #3093 from Kevak/Shock-Collars 
Shock Collars Are Now A Thing.
 2017-10-03 20:16:10 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232 
[MIRROR] Fixes mech fab runtime
 2017-10-03 20:13:06 -04:00
LetterJay
3e975eca09 Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135 
[MIRROR] Adds a var to minds that makes them immune to conversion
 2017-10-03 20:12:43 -04:00
LetterJay
84d98d5973 Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208 
[MIRROR] Makes mobs on fire light up
 2017-10-03 20:12:24 -04:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-03 18:19:40 -05:00
oranges
5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-03 18:15:20 -05:00
oranges
baa53ba1d3 Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-03 18:14:10 -05:00
ShizCalev
d98cd745dd Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:57 -05:00
Kevak
ba99e3845a Added normal collar functionality. 
You can now name your victim's collars on top of other functionality.
 2017-10-03 12:12:52 -07:00
LetterJay
0b7ef4d90f Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233 
[MIRROR] Fixes floating bullet holes
 2017-10-03 12:31:59 -04:00
LetterJay
660e9fea9c Merge pull request #3088 from Citadel-Station-13/upstream-merge-30846 
[MIRROR] Fixes/tweaks wormholes event and portals
 2017-10-03 12:29:46 -04:00
Kevak
f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
Leo
a64e2fd25e Merge pull request #31233 from kevinz000/patch-306 
Fixes floating bullet holes
 2017-10-03 06:18:41 -05:00
kevinz000
3b3b45c03c Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 04:37:35 -05:00
vuonojenmustaturska
ebca0173f3 makes /turf/Enter() faster, and also makes CollidedWith async (#31217) 
* makes /turf/Enter faster, maybe

* waitfor false on atom/collidedwith
 2017-10-03 04:33:23 -05:00
CitadelStationBot
99d57a7f19 [MIRROR] Swarmers work with multiz stations (#3083) 
* Merge pull request #31225 from KorPhaeron/multiz_swarmers

Swarmers work with multiz stations

* Swarmers work with multiz stations
 2017-10-02 23:20:37 -07:00
LetterJay
9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103 
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
 2017-10-02 21:12:31 -04:00
LetterJay
b19f88c2dc Update mineral_doors.dm 2017-10-02 17:32:42 -05:00
LetterJay
a9116b3648 Update portals.dm 2017-10-02 17:32:27 -05:00
LetterJay
865f057d7b Update mecha_control_console.dm 2017-10-02 17:32:11 -05:00
ShizCalev
e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 02:48:51 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
6268682ee3 Merge pull request #3069 from Citadel-Station-13/upstream-merge-31185 
[MIRROR] Fixes gen scanner timer
 2017-10-01 23:40:35 -04:00
LetterJay
2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 
[MIRROR] Adds desc to things lacking them.
 2017-10-01 23:37:35 -04:00
LetterJay
fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
 2017-10-01 23:37:26 -04:00
LetterJay
a468f609d8 Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163 
[MIRROR] Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
 2017-10-01 23:37:09 -04:00
LetterJay
cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129 
[MIRROR] Cleans up some antag/event landmark checks
 2017-10-01 23:36:48 -04:00
ShizCalev
d9c77f628d Fixes gen scanner timer 2017-10-01 17:03:52 -05:00
LetterJay
76d6402a9d Update windoor_assembly.dm 2017-10-01 15:46:31 -05:00
LetterJay
4a4ecdf211 Update transit_tube_construction.dm 2017-10-01 15:46:20 -05:00
LetterJay
1c00a8ba29 Update recycler.dm 2017-10-01 15:38:09 -05:00
LetterJay
f3ae038f6c Update cargo.dm 2017-10-01 15:35:27 -05:00
LetterJay
018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162 
[MIRROR] Fixes plasma cutters only hitting one tile
 2017-10-01 16:32:24 -04:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
 2017-10-01 16:30:40 -04:00
LetterJay
8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132 
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
 2017-10-01 16:29:13 -04:00
LetterJay
1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137 
[MIRROR] Fixes meteors not working with multi z
 2017-10-01 16:21:08 -04:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
LetterJay
6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 2017-10-01 15:45:54 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069 
[MIRROR] Cleanup to various loc assignments and nearby code
 2017-10-01 15:08:21 -04:00
LetterJay
490885a36f update 2017-10-01 13:02:52 -05:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
kevinz000
8636b0a942 Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too 2017-10-01 09:26:45 -05:00
kevinz000
b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
LetterJay
926db45b54 Update world.dm 2017-10-01 03:06:11 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722 
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
 2017-10-01 02:51:56 -04:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763 
[MIRROR] Configuration datum refactor
 2017-10-01 02:50:17 -04:00