Commit Graph

7285 Commits

Author SHA1 Message Date
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 11:32:05 -05:00
LetterJay
be2dc49384 Merge pull request #3408 from Citadel-Station-13/upstream-merge-31694
[MIRROR] Prevents the fire reaction from leaving garbage in the gas mixture
2017-10-15 10:24:22 -04:00
LetterJay
670bd1ef53 Merge pull request #3407 from Citadel-Station-13/upstream-merge-31696
[MIRROR] Fixes freon colours never going away
2017-10-15 10:24:12 -04:00
CitadelStationBot
5bb1a88795 Automatic changelog generation for PR #3406 [ci skip] 2017-10-15 09:23:38 -05:00
LetterJay
e72d36c381 Merge pull request #3406 from deathride58/heavysechoundnerfs
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
LetterJay
a1187795dd Merge pull request #3405 from Citadel-Station-13/upstream-merge-31692
[MIRROR] allows vent internal pressure bound to be set by air alarms
2017-10-15 10:23:26 -04:00
CitadelStationBot
36f825501d Automatic changelog generation for PR #3404 [ci skip] 2017-10-15 09:23:18 -05:00
LetterJay
f6fc47352c Merge pull request #3404 from deathride58/sectweaks
Security department tweaks (Chem dispensers, no more cell windows, and more)
2017-10-15 10:23:17 -04:00
CitadelStationBot
5dc98dc8b3 Automatic changelog generation for PR #3403 [ci skip] 2017-10-15 09:23:08 -05:00
LetterJay
6a288fec29 Merge pull request #3403 from Citadel-Station-13/upstream-merge-31661
[MIRROR] Fixes custom shuttle docker display
2017-10-15 10:23:07 -04:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
CitadelStationBot
4cb81d7535 Automatic changelog generation for PR #3401 [ci skip] 2017-10-15 09:22:54 -05:00
LetterJay
666ef5f60d Merge pull request #3401 from Citadel-Station-13/upstream-merge-31652
[MIRROR] Golden Bike Horns now have a small delay between each flips.
2017-10-15 10:22:52 -04:00
LetterJay
1a79e09cf8 Merge pull request #3400 from Citadel-Station-13/upstream-merge-31663
[MIRROR] Repopulates SSshuttle recover
2017-10-15 10:22:17 -04:00
CitadelStationBot
45e12f7781 Automatic changelog generation for PR #3399 [ci skip] 2017-10-15 09:22:06 -05:00
LetterJay
499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671
[MIRROR] ID ejecting from computers by alt-clicking
2017-10-15 10:22:04 -04:00
LetterJay
8f97e8c65f Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688
[MIRROR] fixes filter NaN issue
2017-10-15 10:21:46 -04:00
CitadelStationBot
0a43141b87 Automatic changelog generation for PR #3396 [ci skip] 2017-10-15 09:21:12 -05:00
LetterJay
6bcec20501 Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
2017-10-15 10:21:11 -04:00
CitadelStationBot
1efd6a339e Automatic changelog generation for PR #3395 [ci skip] 2017-10-15 09:20:06 -05:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
LetterJay
5b4bb85ca1 Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726
[MIRROR] restores safety check in gas mixture temperature_share()
2017-10-15 10:19:33 -04:00
CitadelStationBot
28accab531 Prevents the fire reaction from leaving garbage in the gas mixture 2017-10-15 08:48:31 -05:00
duncathan salt
e2e4d7aa60 Prevents the fire reaction from leaving garbage in the gas mixture (#31694) 2017-10-15 08:48:31 -05:00
LetterJay
243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05:00
CitadelStationBot
a6e413b8ed Automatic changelog generation for PR #3393 [ci skip] 2017-10-15 07:48:58 -05:00
LetterJay
a5ee5c76c8 Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684
[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
2017-10-15 08:48:56 -04:00
CitadelStationBot
e3adc4cc15 Automatic changelog generation for PR #3392 [ci skip] 2017-10-15 07:48:28 -05:00
LetterJay
e2914c5987 Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677
[MIRROR] Allows mobs to get shocked when they smash things
2017-10-15 08:48:26 -04:00
CitadelStationBot
b0a20f0dce Automatic changelog generation for PR #3391 [ci skip] 2017-10-15 07:48:18 -05:00
LetterJay
2f88a62b26 Merge pull request #3391 from Citadel-Station-13/upstream-merge-31674
[MIRROR] Resets client movement delay to its initial value on death
2017-10-15 08:48:17 -04:00
CitadelStationBot
fdb4406fc8 Automatic changelog generation for PR #3390 [ci skip] 2017-10-15 07:48:05 -05:00
LetterJay
58872d8b02 Merge pull request #3390 from Citadel-Station-13/upstream-merge-31616
[MIRROR] readds guardians to the uplink
2017-10-15 08:48:04 -04:00
LetterJay
1b14e571a0 Merge pull request #3388 from Citadel-Station-13/upstream-merge-31706
[MIRROR] pride's hammer has a sprite!
2017-10-15 08:47:20 -04:00
CitadelStationBot
48ff16b3d4 Fixes freon colours never going away 2017-10-15 07:32:53 -05:00
Leo
9c7d2ef609 Merge pull request #31696 from duncathan/atmos-patch6
Fixes freon colours never going away
2017-10-15 07:32:53 -05:00
LetterJay
f4753de219 Update gland.dm 2017-10-15 07:00:28 -05:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
deathride58
dc7f43d72c lets it actually compile 2017-10-15 02:16:13 -04:00
deathride58
bc12f646ed adds sounds to dogborg pounce 2017-10-15 02:10:01 -04:00
deathride58
d6d9c1e1a8 bluh 2017-10-15 01:01:20 -04:00
deathride58
38d139205d wooooooork 2017-10-15 00:53:35 -04:00
deathride58
fe5db1194a fuk 2017-10-15 00:46:45 -04:00
deathride58
47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
deathride58
5078783706 adds grilles outside of armory 2017-10-14 22:40:55 -04:00
deathride58
338c0a5696 gives hardsuit a wall to themselves (updating op with updated picture in like 5 seconds) 2017-10-14 22:38:22 -04:00
deathride58
fff2a6b767 makes sec lobby all access, adds extra shutters to courtroom 2017-10-14 22:27:01 -04:00
oranges
993cf948fb allows vent internal pressure bound to be set by air alarms 2017-10-14 21:10:47 -05:00
deathride58
1a04048978 fixes the regular wall tile amongst the reinforced tiles in boxstation cells 2017-10-14 22:04:58 -04:00
CitadelStationBot
355a76547e Fixes custom shuttle docker display 2017-10-14 18:55:03 -05:00