cc36aa378d
Dsay now shows admin rank instead of ADMIN
2018-06-18 19:17:56 -05:00
cf96c7dd11
Dsay now shows admin rank instead of ADMIN ( #38555 )
...
* Dsay now shows admin rank instead of ADMIN
* All caps to protect the dongs of our admemes
2018-06-18 19:17:55 -05:00
8fd79f9912
Automatic changelog generation for PR #7148 [ci skip]
2018-06-18 13:54:01 -05:00
aee56b1f3d
lets dogborg tongues reduce firestacks when they lick faces ( #7148 )
2018-06-18 11:53:59 -07:00
db25067491
adds missing /'s at the starts of some obj instances ( #7169 )
2018-06-18 11:53:33 -07:00
75def268a6
Automatic changelog generation for PR #7165 [ci skip]
2018-06-18 13:53:16 -05:00
7593a2b931
Fixes airless turfs in catgirl containment facility ( #7165 )
2018-06-18 11:53:14 -07:00
27b6ebc612
Cw's Spaceruins, Maintbar and Kegspawn changes ( #7141 )
...
* Station Changes
-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)
* Space Ruins Changes
-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves
* Kegspawn Change
Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)
* Small MetaStation Fixes
Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
03a22ca16d
[MIRROR] Transit space refactor ( #7130 )
...
* Transit space refactor
* Update bitfields.dm
2018-06-18 11:51:02 -07:00
389e9584a3
Merge pull request #7167 from Citadel-Station-13/upstream-merge-38521
...
[MIRROR] Fix protolathe in Pubby circuit lab
2018-06-18 12:30:52 -05:00
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
69966c026c
Fix protolathe in Pubby circuit lab
2018-06-18 09:39:14 -05:00
ce66967811
Merge pull request #38521 from AutomaticFrenzy/patch/pubby
...
Fix protolathe in Pubby circuit lab
2018-06-18 09:39:14 -05:00
letterjay