Commit Graph
6731 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 39db30987d Automatic changelog generation for PR #3249 [ci skip] 2017-10-09 22:01:27 -05:00
LetterJayandGitHub 6daeeb216e Merge pull request #3249 from Citadel-Station-13/upstream-merge-31412
[MIRROR] Stops airlocks from getting harddeleted, also fixes an unrelated runtime
2017-10-09 23:01:25 -04:00
CitadelStationBot b470194086 Fixes 9mm ammo appearing in traitortot surplus crates 2017-10-09 14:25:30 -05:00
jughuandCitadelStationBot 1cb06f855e Update uplink_item.dm (#31448) 2017-10-09 14:25:30 -05:00
CitadelStationBot 7024919e9d Adds a hacked autolathe subtype 2017-10-09 13:39:43 -05:00
duncathan saltandCitadelStationBot 9a49a512ee Merge pull request #31387 from tgstation/Cyberboss-patch-3
Adds a hacked autolathe subtype
2017-10-09 13:39:42 -05:00
CitadelStationBot ec4b84ce85 Stops airlocks from getting harddeleted, also fixes an unrelated runtime 2017-10-09 08:56:16 -05:00
vuonojenmustaturskaandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub b0effb1c1d Merge pull request #3247 from Citadel-Station-13/MapSync
Map sync
2017-10-09 05:57:39 -04:00
CitadelStationBot d24654fe8b Automatic changelog generation for PR #3245 [ci skip] 2017-10-09 04:57:23 -05:00
LetterJayandGitHub 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 8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
LetterJayandGitHub 067b7fc6df Update genetics.dm 2017-10-08 22:39:42 -05:00
LetterJayandGitHub 271b332928 Update flesh_eating.dm 2017-10-08 22:39:19 -05:00
LetterJayandGitHub 3b00d7c3ea Update fever.dm 2017-10-08 22:39:02 -05:00
LetterJayandGitHub 3778b8bfc0 Update dizzy.dm 2017-10-08 22:38:53 -05:00
LetterJayandGitHub d1d671da47 Update choking.dm 2017-10-08 22:38:44 -05:00
LetterJayandGitHub e65943276d Update weight.dm 2017-10-08 22:38:28 -05:00
LetterJayandGitHub 0bf4fc091d Update voice_change.dm 2017-10-08 22:38:11 -05:00
LetterJayandGitHub 2333f5ee11 Update symptoms.dm 2017-10-08 22:38:01 -05:00
LetterJayandGitHub 73bbc4d4f9 Update shivering.dm 2017-10-08 22:37:45 -05:00
LetterJayandGitHub f239efcd45 Update oxygen.dm 2017-10-08 22:37:34 -05:00
LetterJayandGitHub 9ca3d0fd3d Update itching.dm 2017-10-08 22:37:23 -05:00
LetterJayandGitHub 53a3644f48 Update headache.dm 2017-10-08 22:37:14 -05:00
LetterJayandGitHub 631b98dad5 Update hallucigen.dm 2017-10-08 22:37:02 -05:00
CitadelStationBot 9c0160f779 Automatic changelog generation for PR #3244 [ci skip] 2017-10-08 22:35:57 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot abe180b777 Automatic changelog generation for PR #3236 [ci skip] 2017-10-08 22:32:03 -05:00
LetterJayandGitHub 9638a9232a Merge pull request #3236 from Citadel-Station-13/upstream-merge-31425
[MIRROR] Fixes c20r damage
2017-10-08 23:32:01 -04:00
CitadelStationBot 3cceb4fdf4 Automatic changelog generation for PR #3235 [ci skip] 2017-10-08 22:31:56 -05:00
LetterJayandGitHub 31e624c07e Merge pull request #3235 from Citadel-Station-13/upstream-merge-31421
[MIRROR] Prevents ocular wardens from targeting dead revenants
2017-10-08 23:31:54 -04:00
CitadelStationBot 6359f55410 Prioritizes the PDA pen as a traitor uplink location when the pen is selected 2017-10-08 19:10:50 -05:00
vuonojenmustaturskaandCitadelStationBot 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
XDTMandCitadelStationBot 6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
CitadelStationBot 2c2ef558a3 Internals set to 0 pressure will properly prevent breathing environment air 2017-10-08 19:09:34 -05:00
XDTMandCitadelStationBot a49441b1e2 Internals set to 0 pressure will prevent breathing environment air (#31422) 2017-10-08 19:09:34 -05:00
CitadelStationBot 4cec4da1e7 Basilisks are now gold core spawnable: Cyberboss likes me this time edition 2017-10-08 18:30:45 -05:00
ArmhulenandCitadelStationBot 62a6867f2e Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 18:30:45 -05:00
CitadelStationBot dcf8c70e39 Layers pAIs under mobs to stop bodyblocking 2017-10-08 15:47:32 -05:00
kevinz000andCitadelStationBot 687b329b7b Update pai.dm (#31379) 2017-10-08 15:47:32 -05:00
CitadelStationBot 0e4507255c Adds time dilation data to the feedback table 2017-10-08 15:38:15 -05:00
vuonojenmustaturskaandCitadelStationBot 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