diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index e00aedc8100..07f00c599c3 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -1241,21 +1241,6 @@
/obj/structure/sign/securearea,
/turf/simulated/wall/mineral/plastitanium/explosive,
/area/ruin/unpowered/syndicate_lava_base/main)
-"cf" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/item/radio/intercom/syndicate,
-/turf/simulated/floor/plasteel/dark,
-/area/ruin/unpowered/syndicate_lava_base/telecomms)
"cg" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/simulated/floor/engine{
@@ -3529,10 +3514,6 @@
/obj/machinery/alarm/syndicate{
pixel_y = 24
},
-/obj/item/radio/headset/syndicate/alt{
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"hN" = (
@@ -3558,10 +3539,6 @@
/obj/machinery/alarm/syndicate{
pixel_y = 24
},
-/obj/item/radio/headset/syndicate/alt{
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"hR" = (
@@ -4479,10 +4456,6 @@
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/item/radio/headset/syndicate/alt{
- pixel_x = -3;
- pixel_y = 3
- },
/turf/simulated/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"jB" = (
@@ -6785,7 +6758,6 @@
/obj/machinery/computer/message_monitor{
dir = 1
},
-/obj/item/paper/monitorkey,
/turf/simulated/floor/plasteel/dark,
/area/ruin/unpowered/syndicate_lava_base/telecomms)
"ov" = (
@@ -7400,7 +7372,7 @@ mp
mQ
nl
nJ
-cf
+nJ
ov
mn
ab
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 72e584e91aa..105f6730140 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -103,6 +103,13 @@
/obj/item/radio/headset/syndicate/alt/syndteam
ks1type = /obj/item/encryptionkey/syndteam
+/obj/item/radio/headset/syndicate/alt/lavaland
+ name = "syndicate lavaland headset"
+
+/obj/item/radio/headset/syndicate/alt/lavaland/New()
+ . = ..()
+ set_frequency(SYND_FREQ)
+
/obj/item/radio/headset/binary
origin_tech = "syndicate=3"
ks1type = /obj/item/encryptionkey/binary
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 1086f43dd48..bac8d64d9f2 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -163,11 +163,11 @@
var/pda = -1
var/backpack_contents = -1
var/suit_store = -1
-
var/hair_style
var/facial_hair_style
var/skin_tone
+ var/list/del_types = list(/obj/item/pda, /obj/item/radio/headset)
/obj/effect/mob_spawn/human/Initialize()
if(ispath(outfit))
@@ -227,7 +227,6 @@
if(!isnum(T))
outfit.vars[slot] = T
H.equipOutfit(outfit)
- var/list/del_types = list(/obj/item/pda, /obj/item/radio/headset)
for(var/del_type in del_types)
var/obj/item/I = locate(del_type) in H
qdel(I)
diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
index 33e4fb527ae..532e50831e5 100644
--- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
@@ -32,6 +32,7 @@
You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. DO NOT work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. DO NOT leave your base without admin permission."
outfit = /datum/outfit/lavaland_syndicate
assignedrole = "Lavaland Syndicate"
+ del_types = list() // Necessary to prevent del_types from removing radio!
allow_species_pick = TRUE
/obj/effect/mob_spawn/human/lavaland_syndicate/Destroy()
@@ -46,7 +47,7 @@
suit = /obj/item/clothing/suit/storage/labcoat
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
- r_ear = /obj/item/radio/headset/syndicate/alt
+ r_ear = /obj/item/radio/headset/syndicate/alt/lavaland // See del_types above
back = /obj/item/storage/backpack
r_pocket = /obj/item/gun/projectile/automatic/pistol
id = /obj/item/card/id/syndicate/anyone
@@ -74,9 +75,13 @@
/datum/outfit/lavaland_syndicate/comms
name = "Lavaland Syndicate Comms Agent"
+ r_ear = /obj/item/radio/headset/syndicate/alt // See del_types above
r_hand = /obj/item/melee/energy/sword/saber
mask = /obj/item/clothing/mask/chameleon/gps
suit = /obj/item/clothing/suit/armor/vest
+ backpack_contents = list(
+ /obj/item/paper/monitorkey = 1 // message console on lavaland does NOT spawn with this
+ )
/obj/item/clothing/mask/chameleon/gps/New()
. = ..()