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

4782 Commits

Author SHA1 Message Date
LetterJay
11abb49d12 Merge pull request #3254 from Citadel-Station-13/upstream-merge-31463 
[MIRROR] Stops check antags message if round has not started yet.
 2017-10-09 23:02:06 -04:00
LetterJay
8c0ecb3c5c Merge pull request #3253 from Citadel-Station-13/upstream-merge-31470 
[MIRROR] Uses the proper list for xeno landmarks/nightmare spawning
 2017-10-09 23:01:59 -04:00
LetterJay
95031ae187 Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441 
[MIRROR] Fixes a forceMove(null)
 2017-10-09 23:01:51 -04:00
LetterJay
5d219d691d Merge pull request #3251 from Citadel-Station-13/upstream-merge-31448 
[MIRROR] Fixes 9mm ammo appearing in traitortot surplus crates
 2017-10-09 23:01:43 -04:00
LetterJay
261df4f136 Merge pull request #3250 from Citadel-Station-13/upstream-merge-31387 
[MIRROR] Adds a hacked autolathe subtype
 2017-10-09 23:01:35 -04:00
Leo
afec2b7abc Merge pull request #31463 from AnturK/nobodycanknowofmymistakes 
Stops check antags message if round has not started yet.
 2017-10-09 16:02:37 -05:00
KorPhaeron
e7800a2235 Uses the proper list for xeno landmarks/nightmare spawning (#31470) 2017-10-09 16:00:24 -05:00
kevinz000
2456a2a289 Update plastic.dm (#31441) 2017-10-09 14:26:40 -05:00
jughu
1cb06f855e Update uplink_item.dm (#31448) 2017-10-09 14:25:30 -05:00
duncathan salt
9a49a512ee Merge pull request #31387 from tgstation/Cyberboss-patch-3 
Adds a hacked autolathe subtype
 2017-10-09 13:39:42 -05:00
vuonojenmustaturska
176642ba76 Stops airlocks from getting harddeleted, also fixes an unrelated runtime (#31412) 
* Stops airlocks from getting harddeleted, also fixes an unrelated runtime

Destroying doors with a sniper rifle or anything that flat out destroys them good would runtime in doors.dm #L184.
Also doors would very often not get qdel'd properly, it was not 100% of the time but very common, this *seems* to fix it but since reproducing the bug was never quite certain, I'm not absolutely sure I got it. I did destroy all the doors on the station without triggering a harddel on a door after this fix, where previously it would happen.

* old friend ex_act
 2017-10-09 08:56:16 -05:00
LetterJay
6f2b89ae88 Merge pull request #3246 from Citadel-Station-13/upstream-merge-31434 
[MIRROR] Prioritizes the PDA pen as a traitor uplink location when the pen is selected
 2017-10-09 06:24:02 -04:00
LetterJay
b0effb1c1d Merge pull request #3247 from Citadel-Station-13/MapSync 
Map sync
 2017-10-09 05:57:39 -04:00
LetterJay
44decf880c Merge pull request #3245 from Citadel-Station-13/upstream-merge-31435 
[MIRROR] Fixes Start() of symptoms still working when neutered
 2017-10-09 05:57:21 -04:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
LetterJay
ea41c07221 white 2017-10-08 22:47:42 -05:00
LetterJay
067b7fc6df Update genetics.dm 2017-10-08 22:39:42 -05:00
LetterJay
271b332928 Update flesh_eating.dm 2017-10-08 22:39:19 -05:00
LetterJay
3b00d7c3ea Update fever.dm 2017-10-08 22:39:02 -05:00
LetterJay
3778b8bfc0 Update dizzy.dm 2017-10-08 22:38:53 -05:00
LetterJay
d1d671da47 Update choking.dm 2017-10-08 22:38:44 -05:00
LetterJay
e65943276d Update weight.dm 2017-10-08 22:38:28 -05:00
LetterJay
0bf4fc091d Update voice_change.dm 2017-10-08 22:38:11 -05:00
LetterJay
2333f5ee11 Update symptoms.dm 2017-10-08 22:38:01 -05:00
LetterJay
73bbc4d4f9 Update shivering.dm 2017-10-08 22:37:45 -05:00
LetterJay
f239efcd45 Update oxygen.dm 2017-10-08 22:37:34 -05:00
LetterJay
9ca3d0fd3d Update itching.dm 2017-10-08 22:37:23 -05:00
LetterJay
53a3644f48 Update headache.dm 2017-10-08 22:37:14 -05:00
LetterJay
631b98dad5 Update hallucigen.dm 2017-10-08 22:37:02 -05:00
LetterJay
4f033a7137 Merge pull request #3244 from Citadel-Station-13/upstream-merge-31422 
[MIRROR] Internals set to 0 pressure will properly prevent breathing environment air
 2017-10-08 23:35:56 -04:00
LetterJay
7d4b0961f0 Merge pull request #3243 from Citadel-Station-13/upstream-merge-31358 
[MIRROR] Basilisks are now gold core spawnable: Cyberboss likes me this time edition
 2017-10-08 23:35:43 -04:00
LetterJay
b796fdb31e Merge pull request #3238 from Citadel-Station-13/upstream-merge-31379 
[MIRROR] Layers pAIs under mobs to stop bodyblocking
 2017-10-08 23:32:22 -04:00
LetterJay
9009a5f0da Merge pull request #3237 from Citadel-Station-13/upstream-merge-31278 
[MIRROR] Adds time dilation data to the feedback table
 2017-10-08 23:32:11 -04:00
LetterJay
9638a9232a Merge pull request #3236 from Citadel-Station-13/upstream-merge-31425 
[MIRROR] Fixes c20r damage
 2017-10-08 23:32:01 -04:00
vuonojenmustaturska
8b040dddb2 Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434) 
* you too can be a commit

* requested changes
 2017-10-08 19:10:50 -05:00
XDTM
6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
XDTM
a49441b1e2 Internals set to 0 pressure will prevent breathing environment air (#31422) 2017-10-08 19:09:34 -05:00
Armhulen
62a6867f2e Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 18:30:45 -05:00
kevinz000
687b329b7b Update pai.dm (#31379) 2017-10-08 15:47:32 -05:00
vuonojenmustaturska
7cec0bbf67 Adds time dilation data to the feedback table (#31278) 
* adds time dilation data to the feedback table

* Revert "adds time dilation data to the feedback table"

This reverts commit bed0bd78b6e24be7da8269f6af24e51f0c90ded7.

* adds time dilation data to the feedback table 2: electric boogaloo

* Changes
 2017-10-08 15:38:15 -05:00
FrozenGuy5
3e6fcaec28 Fixes c20r damage (#31425) 
* Fixes c20r damage

* minor pointless documentation
 2017-10-08 15:36:04 -05:00
oranges
3beab07be2 Merge pull request #31421 from Xhuis/wardens_vs_revenants 
Prevents ocular wardens from targeting dead revenants
 2017-10-08 15:32:51 -05:00
LetterJay
1f349aeccc Merge pull request #3233 from Citadel-Station-13/upstream-merge-31419 
[MIRROR] Makes the noop turf less eyerapey
 2017-10-08 16:24:41 -04:00
LetterJay
5e2deeff84 Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411 
[MIRROR] Dedicated equipment removal proc
 2017-10-08 16:24:20 -04:00
LetterJay
1b03aabf03 Merge pull request #3231 from Citadel-Station-13/upstream-merge-31352 
[MIRROR] Allows easy hosting of server side lobby music
 2017-10-08 16:24:06 -04:00
LetterJay
56f05a8476 Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414 
[MIRROR] Fixes mob swap on tables.
 2017-10-08 16:23:43 -04:00
LetterJay
89e4088b86 Merge pull request #3229 from Citadel-Station-13/upstream-merge-31329 
[MIRROR] Clockwork scripture now uses one progress bar instead of multiple
 2017-10-08 16:23:25 -04:00
LetterJay
46180e36f3 Merge pull request #3227 from Citadel-Station-13/upstream-merge-31312 
[MIRROR] Tweak to abandoned airlocks
 2017-10-08 16:22:55 -04:00
LetterJay
f6bfbaa192 Merge pull request #3226 from Citadel-Station-13/upstream-merge-31324 
[MIRROR] Minor refactor to storage items
 2017-10-08 16:22:40 -04:00
LetterJay
f046f4f15b Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413 
[MIRROR] Removes useless commented-out what-if code from the 1970s
 2017-10-08 16:22:10 -04:00