Commit Graph

4796 Commits

Author SHA1 Message Date
LetterJay
ad69aa5b8d Merge pull request #3259 from Citadel-Station-13/upstream-merge-31465
[MIRROR] Removes a spawn from traitor code
2017-10-10 01:05:47 -04:00
LetterJay
e6fad0965d Merge pull request #3258 from Citadel-Station-13/upstream-merge-31451
[MIRROR] Update server tools API to 3.1.0.2
2017-10-10 01:05:35 -04:00
LetterJay
94d36578e1 Merge pull request #3257 from Citadel-Station-13/upstream-merge-31468
[MIRROR] Gets rid of spawns in buttons
2017-10-10 01:05:21 -04:00
LetterJay
e232520705 Merge pull request #3256 from Citadel-Station-13/upstream-merge-31469
[MIRROR] Fixes Teslas always doing the same movement pattern
2017-10-10 01:05:03 -04:00
LetterJay
634633c691 Merge pull request #3255 from Citadel-Station-13/upstream-merge-31466
[MIRROR] Makes config loading messages consistent
2017-10-10 01:04:42 -04:00
LetterJay
803434f3a3 Merge pull request #3240 from deathride58/furryhippie
Cherrypicks several Boxstation changes from old Hippie (+ other small tweaks)
2017-10-09 23:02:31 -04:00
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
LetterJay
3ee08632d2 Update traitor.dm 2017-10-09 21:37:24 -05:00
MoreRobustThanYou
af2d5e4a26 Removes a spawn from traitor code 2017-10-09 19:03:05 -05:00
Jordan Brown
4b2d7b702a Update server tools API to 3.1.0.2 (#31451) 2017-10-09 19:02:47 -05:00
MoreRobustThanYou
6578ae1f5c Gets rid of spawns in buttons (#31468)
* Gets rid of spawns in buttons

* Update doorcontrol.dm
2017-10-09 19:01:37 -05:00
Robustin
c40b82c07d Fixes Teslas always doing the same movement pattern (#31469)
* Random tesla movement

* Parenthesis
2017-10-09 19:01:31 -05:00
Leo
0a1b40c01e Merge pull request #31466 from tgstation/Cyberboss-patch-2
Makes config loading messages consistent
2017-10-09 16:03:47 -05: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
deathride58
501a09fee3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into furryhippie 2017-10-09 14:42:47 -04: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