Commit Graph

7472 Commits

Author SHA1 Message Date
CitadelStationBot
092958fa1f Automatic changelog generation for PR #3466 [ci skip] 2017-10-18 06:35:47 -05:00
LetterJay
5bfabefc84 Merge pull request #3466 from Citadel-Station-13/upstream-merge-31806
[MIRROR] Fixes for Smoke Machine Fixes
2017-10-18 07:35:46 -04:00
CitadelStationBot
9a0418132b Automatic changelog generation for PR #3463 [ci skip] 2017-10-18 06:35:36 -05:00
LetterJay
93e6e4a798 Merge pull request #3463 from Citadel-Station-13/upstream-merge-31784
[MIRROR] Next round of shuttle fixes at the cost of a small piece of my sanity
2017-10-18 07:35:34 -04:00
LetterJay
271a287b52 Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795
[MIRROR] Random runtime fixes.
2017-10-18 07:35:03 -04:00
CitadelStationBot
9ef4ae7671 Automatic changelog generation for PR #3460 [ci skip] 2017-10-18 06:34:54 -05:00
LetterJay
47fa7b353c Merge pull request #3460 from Citadel-Station-13/upstream-merge-31800
[MIRROR] Fixes automatic fire on guns
2017-10-18 07:34:53 -04:00
LetterJay
bab51df97e Merge pull request #3459 from Citadel-Station-13/upstream-merge-31782
[MIRROR] Corrects soil description
2017-10-18 07:34:37 -04:00
CitadelStationBot
2fba7a240b Automatic changelog generation for PR #3458 [ci skip] 2017-10-18 06:34:29 -05:00
LetterJay
ad35b9f65c Merge pull request #3458 from Citadel-Station-13/upstream-merge-31792
[MIRROR] Corrects caravan ambush tool speed
2017-10-18 07:34:27 -04:00
CitadelStationBot
7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472)
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
2017-10-17 22:18:19 -05:00
CitadelStationBot
45b6744417 Fixes for Smoke Machine Fixes 2017-10-17 12:34:28 -05:00
Robustin
d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
CitadelStationBot
1be934c109 Next round of shuttle fixes at the cost of a small piece of my sanity 2017-10-17 12:00:46 -05:00
Emmett Gaines
8a336215f1 Next round of shuttle fixes at the cost of a small piece of my sanity (#31784)
* shuttle bugs begone

* cleanup
2017-10-17 12:00:46 -05:00
CitadelStationBot
ef88abd85d Random runtime fixes. 2017-10-17 09:20:56 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes
Random runtime fixes.
2017-10-17 09:20:55 -05:00
CitadelStationBot
57b5b6c243 Fixes automatic fire on guns 2017-10-17 09:19:42 -05:00
Leo
a9389f4099 Merge pull request #31800 from DaxDupont/500hours
Fixes automatic fire on guns
2017-10-17 09:19:42 -05:00
CitadelStationBot
9691c9130f Automatic changelog generation for PR #3447 [ci skip] 2017-10-17 09:18:57 -05:00
LetterJay
bdbf1f509a Merge pull request #3447 from Citadel-Station-13/upstream-merge-31775
[MIRROR] lowers portable pump max pressure to 25 atm
2017-10-17 10:18:55 -04:00
CitadelStationBot
1cc1a22ba6 Automatic changelog generation for PR #3457 [ci skip] 2017-10-17 09:00:14 -05:00
LetterJay
875d805403 Merge pull request #3457 from Citadel-Station-13/CWCIcons
Fixes missing CWC icons
2017-10-17 10:00:12 -04:00
CitadelStationBot
6a64ccf2e7 Corrects soil description 2017-10-17 08:23:21 -05:00
ShizCalev
77ae7b7724 Corrects soil description 2017-10-17 08:23:21 -05:00
CitadelStationBot
9dc849a674 Corrects caravan ambush tool speed 2017-10-17 08:22:08 -05:00
ShizCalev
d43de80540 Corrects caravan ambush tool speed (#31792)
* Corrects caravan ambush tool speed

* subtype
2017-10-17 08:22:07 -05:00
LetterJay
9a90445554 Merge pull request #3455 from Citadel-Station-13/upstream-merge-31660
[MIRROR] Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities
2017-10-17 08:59:28 -04:00
CitadelStationBot
7ee30feb18 Automatic changelog generation for PR #3454 [ci skip] 2017-10-17 07:59:21 -05:00
LetterJay
d6daa8b3e9 Merge pull request #3454 from Citadel-Station-13/upstream-merge-31699
[MIRROR] Increasew the size of the katana from normal to huge
2017-10-17 08:59:20 -04:00
CitadelStationBot
f8abedde26 Automatic changelog generation for PR #3453 [ci skip] 2017-10-17 07:58:41 -05:00
LetterJay
dc17bfd316 Merge pull request #3453 from Citadel-Station-13/upstream-merge-31750
[MIRROR] Prevent creampie overlays from stacking.
2017-10-17 08:58:39 -04:00
LetterJay
e3922656fc Merge pull request #3452 from Citadel-Station-13/upstream-merge-31761
[MIRROR] obj_break() will always be called before obj_destruction()
2017-10-17 08:58:20 -04:00
CitadelStationBot
8cb9316afa Automatic changelog generation for PR #3451 [ci skip] 2017-10-17 07:58:12 -05:00
LetterJay
db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972
[MIRROR] Atmospherics Multilayer Pipes
2017-10-17 08:58:10 -04:00
LetterJay
21823820c4 Merge pull request #3450 from Citadel-Station-13/upstream-merge-31721
[MIRROR] Fixed the shuttle navigation computer allowing you to move docking ports
2017-10-17 08:57:11 -04:00
LetterJay
c493f75917 Merge pull request #3449 from Citadel-Station-13/upstream-merge-31783
[MIRROR] Adds a duplicate stack_trace to /datum
2017-10-17 08:56:52 -04:00
LetterJay
29ad231f6a Merge pull request #3448 from Citadel-Station-13/upstream-merge-31790
[MIRROR] Fixes me forgetting a semicolon in sargeant araneus
2017-10-17 08:56:42 -04:00
CitadelStationBot
a2fdf20d4a Automatic changelog generation for PR #3446 [ci skip] 2017-10-17 07:55:56 -05:00
LetterJay
ba3a8de585 Merge pull request #3446 from Citadel-Station-13/upstream-merge-31673
[MIRROR] Fixes cogged APCs being permanently locked to non-servants
2017-10-17 08:55:54 -04:00
CitadelStationBot
50506df9a0 Automatic changelog generation for PR #3445 [ci skip] 2017-10-17 07:55:44 -05:00
LetterJay
135b2a3b1d Merge pull request #3445 from Citadel-Station-13/upstream-merge-31741
[MIRROR] Fixes some copypasted airlocks referring to nonexistent overlay sprites
2017-10-17 08:55:42 -04:00
CitadelStationBot
e1bb8bdda9 Automatic changelog generation for PR #3444 [ci skip] 2017-10-17 07:55:35 -05:00
LetterJay
3f339a9908 Merge pull request #3444 from Citadel-Station-13/upstream-merge-31742
[MIRROR] Removes a misleading message when handling full stacks of sheets.
2017-10-17 08:55:33 -04:00
CitadelStationBot
caee1c7505 Automatic changelog generation for PR #3443 [ci skip] 2017-10-17 07:54:59 -05:00
LetterJay
1e67c696f2 Merge pull request #3443 from Citadel-Station-13/upstream-merge-31749
[MIRROR] Decapitation creampie fix [Fix] (#19701)
2017-10-17 08:54:58 -04:00
CitadelStationBot
bb028777cf Automatic changelog generation for PR #3442 [ci skip] 2017-10-17 07:54:43 -05:00
LetterJay
612f2eccc2 Merge pull request #3442 from Citadel-Station-13/upstream-merge-31757
[MIRROR] Makes player-controlled minebots a target for ocular wardens
2017-10-17 08:54:42 -04:00
LetterJay
af1f7ce8d0 Merge pull request #3441 from Citadel-Station-13/upstream-merge-31772
[MIRROR] Add a safety check for usr in airlock shocking
2017-10-17 08:54:33 -04:00
LetterJay
ad07c97ab5 Merge pull request #3440 from Citadel-Station-13/upstream-merge-31771
[MIRROR] Fixes atmos machinery examine
2017-10-17 08:54:24 -04:00