0cb7361eb8
Automatic changelog generation for PR #7166 [ci skip]
2018-06-18 12:30:29 -05:00
81b88d0d85
Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543
...
[MIRROR] Fix non-secure windoors not supporting One Required access mode
2018-06-18 12:30:26 -05:00
d1f9716101
Automatic changelog generation for PR #7164 [ci skip]
2018-06-18 12:29:56 -05:00
34254116bc
Merge pull request #7164 from Citadel-Station-13/upstream-merge-38527
...
[MIRROR] Fix ripples appearing too broadly and disappearing too soon
2018-06-18 12:29:54 -05:00
43cfea2cb4
Automatic changelog generation for PR #7160 [ci skip]
2018-06-18 12:28:44 -05:00
fb53413ded
Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270
...
[MIRROR] [READY] advanced foam extinguisers [READY]
2018-06-18 12:28:42 -05:00
119fb6abf6
Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542
...
[MIRROR] Some minor cleanup to RegisterSignal
2018-06-18 12:28:11 -05:00
e79c48256c
Automatic changelog generation for PR #7158 [ci skip]
2018-06-18 12:27:47 -05:00
6d74717b39
Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533
...
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
2018-06-18 12:27:45 -05:00
83acec5051
Automatic changelog generation for PR #7157 [ci skip]
2018-06-18 12:23:05 -05:00
29ae18fb1a
Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461
...
[MIRROR] Fixes the Blob being banished to the shadow realm
2018-06-18 12:23:03 -05:00
33b8ea8475
Merge pull request #7155 from Citadel-Station-13/upstream-merge-38536
...
[MIRROR] Update node dependencies
2018-06-18 12:19:50 -05:00
ea007a5f36
Automatic changelog generation for PR #7154 [ci skip]
2018-06-18 12:18:34 -05:00
62490e07a8
Merge pull request #7154 from Citadel-Station-13/upstream-merge-38551
...
[MIRROR] Fix item fortification scrolls stacking
2018-06-18 12:18:30 -05:00
e70b505d5a
Automatic changelog generation for PR #7153 [ci skip]
2018-06-18 10:13:08 -05:00
d42c0d42de
Merge pull request #7153 from Citadel-Station-13/upstream-merge-38550
...
[MIRROR] Fix repairing Cyborg headlamp even when its panel is closed
2018-06-18 10:13:05 -05:00
22e866d4f2
Automatic changelog generation for PR #7151 [ci skip]
2018-06-18 10:12:39 -05:00
afb9b5992a
Merge pull request #7151 from LetterN/patch-2
...
fixes shock collars
2018-06-18 10:12:36 -05:00
631cdcd4a7
Automatic changelog generation for PR #7146 [ci skip]
2018-06-18 10:11:52 -05:00
75f0dfcf35
Merge pull request #7146 from deathride58/loocdudewtf
...
Prevents the vast majority of IC in LOOC cases
2018-06-18 10:11:48 -05:00
44c47794b7
Automatic changelog generation for PR #7145 [ci skip]
2018-06-18 10:11:09 -05:00
56286eefaa
Merge pull request #7145 from Citadel-Station-13/upstream-merge-38523
...
[MIRROR] Fix Meta and Delta escape pod rooms having no air
2018-06-18 10:11:06 -05:00
78265ad51b
Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524
...
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
2018-06-18 10:10:49 -05:00
5bd6607137
Automatic changelog generation for PR #7142 [ci skip]
2018-06-18 10:10:10 -05:00
e298e283ee
Merge pull request #7142 from Citadel-Station-13/upstream-merge-38504
...
[MIRROR] Makes the xeno nest ruin harder to cheese.
2018-06-18 10:10:07 -05:00
83d8373711
Automatic changelog generation for PR #7138 [ci skip]
2018-06-18 10:09:44 -05:00
c58dbc1110
Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476
...
[MIRROR] [s] Fix launchpads creating way too many sparks
2018-06-18 10:09:42 -05:00
923a43ca5e
Automatic changelog generation for PR #7137 [ci skip]
2018-06-18 10:09:37 -05:00
c40a2e698d
Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496
...
[MIRROR] Fix being able to pull mirage borders, others
2018-06-18 10:09:20 -05:00
0253107d67
Automatic changelog generation for PR #7134 [ci skip]
2018-06-18 09:53:09 -05:00
90df70a8f1
Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509
...
[MIRROR] Makes the caravan ambush ruin harder to cheese
2018-06-18 09:53:05 -05:00
8421e41fbe
Automatic changelog generation for PR #7133 [ci skip]
2018-06-18 09:52:28 -05:00
8393a6b34b
Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510
...
[MIRROR] Cleans up the chem synths jesus christ what the fuck
2018-06-18 09:52:24 -05:00
937d2b20fe
Automatic changelog generation for PR #7125 [ci skip]
2018-06-18 09:51:08 -05:00
aa0e383a2c
Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490
...
[MIRROR] Fixes missing creampies
2018-06-18 09:50:56 -05:00
a97514965a
Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486
...
[MIRROR] Removes an unused open turf var
2018-06-18 09:50:35 -05:00
67991e4a3b
Automatic changelog generation for PR #7123 [ci skip]
2018-06-18 09:44:00 -05:00
30bd4c5944
Merge pull request #7123 from Citadel-Station-13/upstream-merge-38482
...
[MIRROR] Add syndicate headset messages, squashes both together.
2018-06-18 09:43:56 -05:00
c9423e0044
Fix non-secure windoors not supporting One Required access mode
2018-06-18 09:39:00 -05:00
896942dcf1
Fix non-secure windoors not supporting One Required access mode ( #38543 )
2018-06-18 09:39:00 -05:00
7651a1b96b
Fix ripples appearing too broadly and disappearing too soon
2018-06-18 09:38:42 -05:00
a70cbed1f7
Merge pull request #38527 from AutomaticFrenzy/patch/ripples
...
Fix ripples appearing too broadly and disappearing too soon
2018-06-18 09:38:42 -05:00
343a20ed41
[READY] advanced foam extinguisers [READY]
2018-06-18 09:38:08 -05:00
1a42719d80
Advanced foam extinguisers ( #38270 )
...
* mining voucher tweak
* will it blend
* d
* s
* ss
* advanced fire extinuishers
* remove trash
* garbage cleaning
* lets see
* t
* whatever
* test if using a var compiles
* adds it to cargo
* adds to atmos + ce
* should fix the sprites
* lowers the volume of the foam tank
* gonna load the icon for this soon
* woops
* foam icon
* ddd
* it works
* boo
* r34ijfirgv5
2018-06-18 09:38:07 -05:00
2939115cfb
Some minor cleanup to RegisterSignal
2018-06-18 09:37:57 -05:00
548d498a5e
Merge pull request #38542 from ninjanomnom/do-you-have-a-callback-license
...
Some minor cleanup to RegisterSignal
2018-06-18 09:37:57 -05:00
3fe0ec584c
Automatic changelog generation for PR #7131 [ci skip]
2018-06-18 09:37:52 -05:00
18b1bdbbe9
Adds dance machine, drink dispensers, flavor to beach bum ruin
2018-06-18 09:37:48 -05:00
241d0c7a9a
Adds dance machine, drink dispensers, flavor to beach bum ruin ( #38533 )
...
* shit was SO cash
* correct dance machine subtype
* moves defines from map file to corpse.dm
* improves bartender flavor text
* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-18 09:37:48 -05:00
fc7f29c7bc
Merge pull request #7131 from Citadel-Station-13/upstream-merge-38329
...
[MIRROR] [READY] [TESTED] Fusion Rework Episode V: The Phantom Fusion
2018-06-18 09:37:47 -05:00
CitadelStationBot