Commit Graph

4821 Commits

Author SHA1 Message Date
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
LetterJay
295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix
Fixes Shock Collars Getting Stuck In Pockets.
2017-10-10 02:46:45 -04:00
LetterJay
e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066
[MIRROR] Refactors virus spreading
2017-10-10 02:46:04 -04:00
Kevak
fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
LetterJay
9aca1d6cf6 Merge pull request #3261 from Citadel-Station-13/upstream-merge-31446
[MIRROR] Boolean defines in mech construction datums, clears out some dels
2017-10-10 01:06:12 -04:00
LetterJay
7edd104159 Merge pull request #3260 from Citadel-Station-13/upstream-merge-31439
[MIRROR] Fixes invalid arg runtime with drop_if_replaced
2017-10-10 01:05:59 -04:00
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
b969bb7eec Update data_huds.dm 2017-10-10 00:04:20 -05: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
LetterJay
3232f0a2a0 Update flightsuit.dm 2017-10-09 21:27:59 -05:00
LetterJay
e8d09d796a Update data_huds.dm 2017-10-09 21:27:36 -05:00
LetterJay
8596fa93e4 Update transformation.dm 2017-10-09 21:27:12 -05:00
LetterJay
fc1b2c4e75 Update rhumba_beat.dm 2017-10-09 21:26:46 -05:00
LetterJay
2d3b4225d9 Update retrovirus.dm 2017-10-09 21:26:33 -05:00
LetterJay
9304ae1a38 Update pierrot_throat.dm 2017-10-09 21:26:20 -05:00
LetterJay
3a5ac95c4e Update magnitis.dm 2017-10-09 21:26:09 -05:00
LetterJay
e5c2284213 Update gbs.dm 2017-10-09 21:25:59 -05:00
LetterJay
a93240f6a1 Update fluspanish.dm 2017-10-09 21:25:47 -05:00
LetterJay
b1b3673fe9 Update flu.dm 2017-10-09 21:25:35 -05:00
LetterJay
93a0f5fe8c Update fake_gbs.dm 2017-10-09 21:24:54 -05:00
LetterJay
43ced58616 Update cold9.dm 2017-10-09 21:24:45 -05:00
LetterJay
8cc5186cf4 Update cold.dm 2017-10-09 21:24:35 -05:00
LetterJay
05250b3ce9 Update brainrot.dm 2017-10-09 21:24:23 -05:00
LetterJay
c3d6ce6bc6 Update beesease.dm 2017-10-09 21:24:14 -05:00
kevinz000
7bd73f6e1d Update mecha_construction_paths.dm (#31446) 2017-10-09 19:05:25 -05:00
kevinz000
cee28e27fe Fixes invalid arg runtime with drop_if_replaced (#31439)
* Update augments_eyes.dm

* Update eyes.dm
2017-10-09 19:05:18 -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
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -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