diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index bff49a0abcf..2e9edd7d8b8 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -55,6 +55,8 @@ GLOBAL_LIST_EMPTY(all_areas)
GLOBAL_LIST_EMPTY_TYPED(all_species, /datum/species)
/// Short names of all species.
GLOBAL_LIST_EMPTY(all_species_short_names)
+/// Species short names by bodytype.
+GLOBAL_LIST_EMPTY(all_species_bodytypes)
/// All language datums. String to instance.
GLOBAL_LIST_EMPTY(all_languages)
/// Table of say codes for all languages.
@@ -225,6 +227,8 @@ GLOBAL_LIST_EMPTY(contained_clothing_species_adaption_cache)
if(length(S.autohiss_basic_map) || length(S.autohiss_extra_map) || length(S.autohiss_basic_extend) || length(S.autohiss_extra_extend))
S.has_autohiss = TRUE
GLOB.all_species[S.name] = S
+ if(!GLOB.all_species_bodytypes[S.bodytype])
+ GLOB.all_species_bodytypes[S.bodytype] = S.short_name
GLOB.all_species_short_names |= S.short_name
sortTim(GLOB.all_species, GLOBAL_PROC_REF(cmp_text_asc))
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 90e3b3ba854..17853eed5fc 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -13,6 +13,25 @@
if(id_icon)
C.icon_state = id_icon
+/obj/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(!visualsOnly)
+ if(H?.wear_suit && istype(H.wear_suit, /obj/item/clothing/suit/space/void))
+ var/obj/item/clothing/suit = H.wear_suit
+ if(!(H.species.bodytype in suit.species_restricted))
+ if(suit.contained_sprite)
+ suit.refit_contained(H.species.bodytype)
+ else
+ suit.refit_for_species(H.species.bodytype)
+ if(H?.head && istype(H.head, /obj/item/clothing/head/helmet/space/void))
+ var/obj/item/clothing/head = H.head
+ if(!(H.species.bodytype in head.species_restricted))
+ if(head.contained_sprite)
+ head.refit_contained(H.species.bodytype)
+ else
+ head.refit_for_species(H.species.bodytype)
+
+
/obj/outfit/admin/random_employee
name = "Random Employee"
diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm
index 94d66795eea..11d607ff1d0 100644
--- a/code/game/machinery/suit_cycler.dm
+++ b/code/game/machinery/suit_cycler.dm
@@ -45,6 +45,8 @@
var/can_repair // If set, the cycler can repair voidsuits.
var/electrified = FALSE
+ //Will it change the suit name to "refitted [x]" on refit
+ var/rename_on_refit = TRUE
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering", "Mining", "Medical", "Security", "Atmos")
//Species that the suits can be configured to fit.
@@ -257,7 +259,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
to_chat(user, SPAN_WARNING("You run the sequencer across the interface, corrupting the operating protocols."))
- departments = list("Engineering", "Mining", "Medical", "Security", "Atmos", "^%###^%$")
+ departments = list("Engineering", "Mining", "Medical", "Security", "Atmos", "^%###^%$", "Unchanged")
emagged = TRUE
safeties = FALSE
req_access = list()
@@ -296,7 +298,9 @@
"model_text" = model_text,
"radiation_level" = radiation_level,
"target_department" = target_department,
+ "department_change" = can_change_departments(),
"target_species" = target_species,
+ "species_change" = can_change_species(),
"helmet" = helmet ? list("name" = helmet.name, "damage" = 0) : null,
"suit" = suit ? list("name" = suit.name, "damage" = suit.damage) : null,
"boots" = boots ? list("name" = boots.name, "damage" = 0) : null,
@@ -345,11 +349,15 @@
update_icon()
else if(action == "select_department")
+ if(!can_change_departments())
+ return
var/choice = tgui_input_list(usr, "Please select the target department paintjob.", "Cycler Target Department Selection", departments, target_department)
if(choice)
target_department = choice
else if(action == "select_species")
+ if(!can_change_species())
+ return
var/choice = tgui_input_list(usr, "Please select the target species configuration.", "Cycler Target Species Selection", species, target_species)
if(choice)
target_species = choice
@@ -526,99 +534,133 @@
return
if(target_species)
- if(helmet)
+ if(helmet && !helmet.contained_sprite)
helmet.refit_for_species(target_species)
- if(suit)
+ if(suit && !suit.contained_sprite)
suit.refit_for_species(target_species)
switch(target_department)
if("Engineering")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
helmet.name = "engineering voidsuit helmet"
- helmet.icon_state = "rig0-engineering"
- helmet.item_state = "eng_helm"
+ helmet.icon_state = "engineering_helm"
+ helmet.item_state = "engineering_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
suit.name = "engineering voidsuit"
- suit.icon_state = "rig-engineering"
- suit.item_state = "eng_voidsuit"
+ suit.icon_state = "engineering"
+ suit.item_state = "engineering"
if("Mining")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/mining.dmi'
helmet.name = "mining voidsuit helmet"
- helmet.icon_state = "rig0-mining"
+ helmet.icon_state = "mining_helm"
helmet.item_state = "mining_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/mining.dmi'
suit.name = "mining voidsuit"
- suit.icon_state = "rig-mining"
- suit.item_state = "mining_voidsuit"
+ suit.icon_state = "mining"
+ suit.item_state = "mining"
if("Medical")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/medical.dmi'
helmet.name = "medical voidsuit helmet"
- helmet.icon_state = "rig0-medical"
+ helmet.icon_state = "medical_helm"
helmet.item_state = "medical_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/medical.dmi'
suit.name = "medical voidsuit"
- suit.icon_state = "rig-medical"
- suit.item_state = "medical_voidsuit"
+ suit.icon_state = "medical"
+ suit.item_state = "medical"
if("Security")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
helmet.name = "security voidsuit helmet"
- helmet.icon_state = "rig0-sec"
- helmet.item_state = "sec_helm"
+ helmet.icon_state = "security_helm"
+ helmet.item_state = "security_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
suit.name = "security voidsuit"
- suit.icon_state = "rig-sec"
- suit.item_state = "sec_voidsuit"
+ suit.icon_state = "security"
+ suit.item_state = "security"
if("Atmos")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
helmet.name = "atmospherics voidsuit helmet"
- helmet.icon_state = "rig0-atmos"
+ helmet.icon_state = "atmos_helm"
helmet.item_state = "atmos_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
suit.name = "atmospherics voidsuit"
- suit.icon_state = "rig-atmos"
- suit.item_state = "atmos_voidsuit"
+ suit.icon_state = "atmos"
+ suit.item_state = "atmos"
if("Captain")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
helmet.name = "captain voidsuit helmet"
- helmet.icon_state = "capspace"
- helmet.item_state = "capspace"
+ helmet.icon_state = "captain_helm"
+ helmet.item_state = "captain_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
suit.name = "captain voidsuit"
- suit.icon_state = "capspace"
- suit.item_state = "capspace"
+ suit.icon_state = "captain"
+ suit.item_state = "captain"
if("^%###^%$", "Mercenary")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
helmet.name = "blood-red voidsuit helmet"
- helmet.icon_state = "rig0-syndie"
+ helmet.icon_state = "syndie_helm"
helmet.item_state = "syndie_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
suit.name = "blood-red voidsuit"
- suit.item_state = "syndie_voidsuit"
- suit.icon_state = "rig-syndie"
+ suit.item_state = "syndie"
+ suit.icon_state = "syndie"
if("Research")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
helmet.name = "research voidsuit helmet"
- helmet.icon_state = "rig0-sci"
- helmet.item_state = "research_voidsuit_helmet"
+ helmet.icon_state = "research_helm"
+ helmet.item_state = "research_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
suit.name = "research voidsuit"
- suit.item_state = "research_voidsuit"
- suit.icon_state = "rig-sci"
+ suit.item_state = "research"
+ suit.icon_state = "research"
if("Freelancers")
if(helmet)
+ helmet.icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
helmet.name = "freelancer voidsuit helmet"
- helmet.icon_state = "rig0-freelancer"
- helmet.item_state = "rig0-freelancer"
+ helmet.icon_state = "freelancer_helm"
+ helmet.item_state = "freelancer_helm"
if(suit)
+ suit.icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
suit.name = "freelancer voidsuit"
suit.item_state = "freelancer"
suit.icon_state = "freelancer"
if(helmet)
- helmet.name = "refitted [helmet.name]"
+ if(helmet.contained_sprite)
+ helmet.refit_contained(target_species)
+ if(rename_on_refit)
+ helmet.name = "refitted [helmet.name]"
if(suit)
- suit.name = "refitted [suit.name]"
+ if(suit.contained_sprite)
+ suit.refit_contained(target_species)
+ if(rename_on_refit)
+ suit.name = "refitted [suit.name]"
update_icon()
+/obj/machinery/suit_cycler/proc/can_change_departments()
+ if(departments.len <= 1)
+ return FALSE
+ else return TRUE
+
+/obj/machinery/suit_cycler/proc/can_change_species()
+ if(species.len <= 1)
+ return FALSE
+ else return TRUE
+
#undef TRY_INSERT_SUIT_PIECE
diff --git a/code/game/machinery/suit_cycler_units.dm b/code/game/machinery/suit_cycler_units.dm
index c96d5a422d7..30de69d711d 100644
--- a/code/game/machinery/suit_cycler_units.dm
+++ b/code/game/machinery/suit_cycler_units.dm
@@ -56,7 +56,7 @@
name = "non-standard suit cycler"
model_text = "Nonstandard"
req_access = list(ACCESS_SYNDICATE)
- departments = list("Mercenary")
+ departments = list("Mercenary", "Unchanged") //So the merc suit cycler can refit relevant suits
can_repair = TRUE
/obj/machinery/suit_cycler/syndicate/prepared
@@ -128,3 +128,160 @@
suit = /obj/item/clothing/suit/space/void/freelancer
boots = /obj/item/clothing/shoes/magboots
mask = /obj/item/clothing/mask/breath
+
+//Offship and ghostrole suit cyclers
+/obj/machinery/suit_cycler/offship //To be set up for various offships
+ model_text = "Unbranded"
+ req_access = null
+ departments = list("N/A")
+ can_repair = TRUE
+ rename_on_refit = FALSE
+ species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_SKRELL, BODYTYPE_UNATHI, BODYTYPE_VAURCA)
+ boots = /obj/item/clothing/shoes/magboots
+ mask = /obj/item/clothing/mask/breath
+
+/obj/machinery/suit_cycler/offship/biesel
+ model_text = "Zavodskoi Interstellar"
+ req_access = list(ACCESS_TCAF_SHIPS)
+ departments = list("Tau Ceti Armed Forces")
+ suit = /obj/item/clothing/suit/space/void/tcaf
+ helmet = /obj/item/clothing/head/helmet/space/void/tcaf
+
+/obj/machinery/suit_cycler/offship/coc
+ model_text = "Coalition"
+ req_access = list(ACCESS_COALITION)
+ departments = list("Vulture")
+ species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_SKRELL)
+ suit = /obj/item/clothing/suit/space/void/coalition
+ helmet = /obj/item/clothing/head/helmet/space/void/coalition
+
+/obj/machinery/suit_cycler/offship/gadpathur
+ model_text = "Gadpathurian Navy"
+ req_access = list(ACCESS_GADPATHUR_NAVY)
+ departments = list("Gadpathur")
+ species = list(BODYTYPE_HUMAN)
+ suit = /obj/item/clothing/suit/space/void/coalition/gadpathur
+ helmet = /obj/item/clothing/head/helmet/space/void/coalition/gadpathur
+ mask = /obj/item/clothing/mask/breath/gadpathur
+
+/obj/machinery/suit_cycler/offship/dominia
+ model_text = "Zhurong Imperial Shipyards"
+ req_access = list(ACCESS_IMPERIAL_FLEET_VOIDSMAN_SHIP)
+ departments = list("Dominia")
+ species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
+ suit = /obj/item/clothing/suit/space/void/dominia
+ helmet = /obj/item/clothing/head/helmet/space/void/dominia
+
+/obj/machinery/suit_cycler/offship/dominia/voidsman
+ species = list(BODYTYPE_HUMAN)
+ suit = /obj/item/clothing/suit/space/void/dominia/voidsman
+ helmet = /obj/item/clothing/head/helmet/space/void/dominia/voidsman
+
+/obj/machinery/suit_cycler/offship/dpra
+ model_text = "People's Volunteer Spacer Militia"
+ req_access = list(ACCESS_DPRA)
+ departments = list("DPRA")
+ species = list(BODYTYPE_TAJARA)
+ suit = /obj/item/clothing/suit/space/void/dpra
+ helmet = /obj/item/clothing/head/helmet/space/void/dpra
+
+/obj/machinery/suit_cycler/offship/elyra
+ model_text = "Elyran Naval Infantry"
+ req_access = list(ACCESS_ELYRAN_NAVAL_INFANTRY_SHIP)
+ departments = list("Elyra")
+ species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
+ suit = /obj/item/clothing/suit/space/void/valkyrie
+ helmet = /obj/item/clothing/head/helmet/space/void/valkyrie
+
+/obj/machinery/suit_cycler/offship/hegemony
+ model_text = "Izweski Navy"
+ req_access = list(ACCESS_KATAPHRACT)
+ departments = list("Izweski Hegemony")
+ species = list(BODYTYPE_UNATHI)
+ suit = /obj/item/clothing/suit/space/void/hegemony
+ helmet = /obj/item/clothing/head/helmet/space/void/hegemony
+ boots = /obj/item/clothing/shoes/magboots/hegemony
+
+/obj/machinery/suit_cycler/offship/hegemony/specialist
+ suit = /obj/item/clothing/suit/space/void/hegemony/specialist
+ helmet = /obj/item/clothing/head/helmet/space/void/hegemony/specialist
+
+/obj/machinery/suit_cycler/offship/hegemony/priest
+ suit = /obj/item/clothing/suit/space/void/hegemony/priest
+ helmet = /obj/item/clothing/head/helmet/space/void/hegemony/priest
+
+/obj/machinery/suit_cycler/offship/hegemony/captain
+ req_access = list(ACCESS_KATAPHRACT_KNIGHT)
+ suit = /obj/item/clothing/suit/space/void/hegemony/captain
+ helmet = /obj/item/clothing/head/helmet/space/void/hegemony/captain
+
+/obj/machinery/suit_cycler/offship/hephaestus
+ model_text = "Hephaestus Industries"
+ req_access = list(ACCESS_HEPHAESTUS)
+ departments = list("Hephaestus")
+ species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
+ suit = /obj/item/clothing/suit/space/void/hephaestus
+ helmet = /obj/item/clothing/head/helmet/space/void/hephaestus
+
+/obj/machinery/suit_cycler/offship/kataphract
+ model_text = "Kataphract Guild"
+ req_access = list(ACCESS_KATAPHRACT)
+ departments = list("Kataphract")
+ species = list(BODYTYPE_UNATHI)
+ suit = /obj/item/clothing/suit/space/void/kataphract
+ helmet = /obj/item/clothing/head/helmet/space/void/kataphract
+ boots = /obj/item/clothing/shoes/magboots/hegemony
+
+/obj/machinery/suit_cycler/offship/kataphract/specialist
+ req_access = list(ACCESS_KATAPHRACT_KNIGHT)
+ suit = /obj/item/clothing/suit/space/void/kataphract/spec
+ helmet = /obj/item/clothing/head/helmet/space/void/kataphract/spec
+
+/obj/machinery/suit_cycler/offship/kataphract/lead
+ req_access = list(ACCESS_KATAPHRACT_KNIGHT)
+ suit = /obj/item/clothing/suit/space/void/kataphract/lead
+ helmet = /obj/item/clothing/head/helmet/space/void/kataphract/lead
+
+/obj/machinery/suit_cycler/offship/konyang
+ model_text = "Konyang Aerospace Force"
+ req_access = list(ACCESS_KONYANG_POLICE)
+ departments = list("Konyang")
+ species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
+ suit = /obj/item/clothing/suit/space/void/sol/konyang
+ helmet = /obj/item/clothing/head/helmet/space/void/sol/konyang
+
+/obj/machinery/suit_cycler/offship/nka
+ model_text = "Her Majesty's Mercantile Flotilla"
+ req_access = list(ACCESS_NKA)
+ departments = list("NKA")
+ species = list(BODYTYPE_TAJARA)
+ suit = /obj/item/clothing/suit/space/void/nka
+ helmet = /obj/item/clothing/head/helmet/space/void/nka
+
+/obj/machinery/suit_cycler/offship/pra
+ model_text = "People's Republic of Adhomai"
+ req_access = list(ACCESS_PRA)
+ departments = list("PRA")
+ species = list(BODYTYPE_TAJARA)
+ suit = /obj/item/clothing/suit/space/void/pra
+ helmet = /obj/item/clothing/head/helmet/space/void/pra
+
+/obj/machinery/suit_cycler/offship/sol
+ model_text = "Sol Alliance"
+ req_access = list(ACCESS_SOL_SHIPS)
+ departments = list("Sol")
+ species = list(BODYTYPE_HUMAN)
+ suit = /obj/item/clothing/suit/space/void/sol
+ helmet = /obj/item/clothing/head/helmet/space/void/sol
+
+/obj/machinery/suit_cycler/offship/sol/fsf
+ suit = /obj/item/clothing/suit/space/void/sol/fsf
+ helmet = /obj/item/clothing/head/helmet/space/void/sol/fsf
+
+/obj/machinery/suit_cycler/offship/sol/sfa
+ suit = /obj/item/clothing/suit/space/void/sol/sfa
+ helmet = /obj/item/clothing/head/helmet/space/void/sol/sfa
+
+/obj/machinery/suit_cycler/offship/sol/ssmd
+ suit = /obj/item/clothing/suit/space/void/sol/ssmd
+ helmet = /obj/item/clothing/head/helmet/space/void/sol/ssmd
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index fa0afea637c..7057d11db63 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -231,7 +231,8 @@
///Used to determine whether something can pick a lock, and how well
var/lock_picking_level = 0
- // Its vital that if you make new power tools or new recipies that you include this
+ ///Used to determine what this item can be changed into with a modkit
+ var/list/convert_options
/obj/item/Initialize(mapload, ...)
. = ..()
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 71b8bfa88f2..557ecef9959 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -9,6 +9,7 @@
icon_state = "modkit"
var/parts = MODKIT_FULL
var/target_species = BODYTYPE_HUMAN
+ var/is_multi_species = FALSE //can this modkit change things for multiple species?
var/list/permitted_types = list(
/obj/item/clothing/head/helmet/space/void,
@@ -20,7 +21,7 @@
if(!proximity)
return
- if (!target_species)
+ if (!target_species && !is_multi_species)
return //it shouldn't be null, okay?
if(!parts)
@@ -39,6 +40,10 @@
to_chat(user, SPAN_NOTICE("\The [src] is unable to modify that."))
return
+ if(is_multi_species)
+ target_species = tgui_input_list(user, "Select Species To Refit", "Voidsuit Modkit", I.refittable_species)
+ if(!target_species)
+ return
var/excluding = ("exclude" in I.species_restricted)
var/in_list = (target_species in I.species_restricted)
if (excluding ^ in_list)
@@ -56,7 +61,10 @@
SPAN_NOTICE("You open \the [src] and modify \the [O].")
)
- I.refit_for_species(target_species)
+ if(I.contained_sprite)
+ I.refit_contained(target_species)
+ else
+ I.refit_for_species(target_species)
if (istype(I, /obj/item/clothing/head/helmet))
parts &= ~MODKIT_HELMET
@@ -71,13 +79,30 @@
/obj/item/device/modkit/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
- . += "It looks as though it modifies voidsuits to fit [target_species] users."
+ . += "It looks as though it modifies voidsuits to fit [is_multi_species ? "users of multiple species" : "[target_species] users"]."
/obj/item/device/modkit/tajaran
name = "tajaran voidsuit modification kit"
desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for tajara."
target_species = BODYTYPE_TAJARA
+/obj/item/device/modkit/unathi
+ name = "unathi voidsuit modification kit"
+ target_species = BODYTYPE_UNATHI
+
+/obj/item/device/modkit/skrell
+ name = "skrell voidsuit modification kit"
+ target_species = BODYTYPE_SKRELL
+
+/obj/item/device/modkit/ipc
+ name = "ipc voidsuit modification kit"
+ target_species = BODYTYPE_IPC
+
+/obj/item/device/modkit/multi_species
+ name = "multi-species voidsuit modification kit"
+ desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for a wide range of alien species."
+ is_multi_species = TRUE
+
/obj/item/voidsuit_modkit
name = "voidsuit kit"
icon = 'icons/obj/device.dmi'
@@ -176,90 +201,6 @@
/obj/item/rig_assembly/industrial = /obj/item/rig_assembly/industrial/himeo
)
-/obj/item/voidsuit_modkit/srf
- name = "srf voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/srf,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/srf
- )
-
-/obj/item/voidsuit_modkit/league
- name = "league voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item\
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/league,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/league
- )
-
-/obj/item/voidsuit_modkit/fsf
- name = "fsf voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/fsf,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/fsf
- )
-
-/obj/item/voidsuit_modkit/ssmd
- name = "ssmd voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/ssmd,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/ssmd
- )
-
-/obj/item/voidsuit_modkit/spg
- name = "spg voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/spg,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/spg
- )
-
-/obj/item/voidsuit_modkit/mrsp
- name = "mrsp voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/mrsp,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/mrsp
- )
-
-/obj/item/voidsuit_modkit/sfa
- name = "sfa voidsuit kit"
- desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/sfa,
- /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/sfa
- )
-
/obj/item/voidsuit_modkit/dominianvoid
name = "dominian voidsman's voidsuit kit"
desc = "A highly complicated device that allows you to convert a Dominian prejoroub combat suit into its voidsman counterpart. Practical!"
@@ -272,137 +213,173 @@
/obj/item/clothing/suit/space/void/dominia = /obj/item/clothing/suit/space/void/dominia/voidsman
)
-/obj/item/voidsuit_modkit/tarwa
- name = "tarwa conglomerate voidsuit kit"
- desc = "A highly complicated device that allows you to convert an Unathi pirate suit into its Tarwa Conglomerate counterpart. Practical!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/unathi_pirate = /obj/item/clothing/head/helmet/space/void/unathi_pirate/tarwa,
- /obj/item/clothing/suit/space/void/unathi_pirate = /obj/item/clothing/suit/space/void/unathi_pirate/tarwa,
- /obj/item/clothing/head/helmet/space/void/unathi_pirate/captain = /obj/item/clothing/head/helmet/space/void/unathi_pirate/tarwa/captain,
- /obj/item/clothing/suit/space/void/unathi_pirate/captain = /obj/item/clothing/suit/space/void/unathi_pirate/tarwa/captain
- )
-
-/obj/item/voidsuit_modkit/kazu
- name = "kazu's techraiders voidsuit kit"
- desc = "A highly complicated device that allows you to convert an Unathi pirate suit into its Techraider counterpart. Practical!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/unathi_pirate = /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu,
- /obj/item/clothing/suit/space/void/unathi_pirate = /obj/item/clothing/suit/space/void/unathi_pirate/kazu,
- /obj/item/clothing/head/helmet/space/void/unathi_pirate/captain = /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu/captain,
- /obj/item/clothing/suit/space/void/unathi_pirate/captain = /obj/item/clothing/suit/space/void/unathi_pirate/kazu/captain
- )
-
-/obj/item/voidsuit_modkit/hiskyn
- name = "hiskyn revanchist voidsuit kit"
- desc = "A highly complicated device that allows you to convert an Unathi pirate suit into its Hiskyn Revanchist counterpart. Practical!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
- The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/clothing/head/helmet/space/void/unathi_pirate = /obj/item/clothing/head/helmet/space/void/unathi_pirate/hiskyn,
- /obj/item/clothing/suit/space/void/unathi_pirate = /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn,
- /obj/item/clothing/head/helmet/space/void/unathi_pirate/captain = /obj/item/clothing/head/helmet/space/void/unathi_pirate/hiskyn/captain,
- /obj/item/clothing/suit/space/void/unathi_pirate/captain = /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn/captain
- )
-
-/obj/item/voidsuit_modkit/nexus
- name = "\improper Nexus voidsuit kit"
- desc = "A highly complicated device that allows you to convert a NanoTrasen hardsuit into its Nexus variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on a hardsuit with this item \
- The same process can be used to convert the hardsuit back into a regular hardsuit. Make sure not to have any modules in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/rig/nanotrasen = /obj/item/rig/nanotrasen/nexus,
- /obj/item/rig/nanotrasen/nexus = /obj/item/rig/nanotrasen
- )
-
-/obj/item/voidsuit_modkit/nt_auxiliary
- name = "\improper NanoTrasen corporate auxiliary voidsuit kit"
- desc = "A highly complicated device that allows you to convert a NanoTrasen hardsuit into its corporate auxiliary variant. Wow!"
- desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on a hardsuit with this item \
- The same process can be used to convert the hardsuit back into a regular hardsuit. Make sure not to have any modules in the suit \
- or else it will be deleted."
- w_class = ITEMSIZE_SMALL
- suit_options = list(
- /obj/item/rig/nanotrasen = /obj/item/rig/nanotrasen/corporate_auxiliary,
- /obj/item/rig/nanotrasen/corporate_auxiliary = /obj/item/rig/nanotrasen
- )
-
-/obj/item/storage/box/srf
- name = "srf modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/srf = 4)
-
-/obj/item/storage/box/league
- name = "league modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/league = 4)
-
-/obj/item/storage/box/fsf
- name = "fsf modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/fsf = 4)
-
-/obj/item/storage/box/ssmd
- name = "ssmd modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/ssmd = 4)
-
-/obj/item/storage/box/spg
- name = "spg modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/spg = 4)
-
-/obj/item/storage/box/mrsp
- name = "mrsp modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/mrsp = 4)
-
-/obj/item/storage/box/sfa
- name = "sfa modkit box"
- desc = "Contains modkits to convert Solarian voidsuits into a warlord variant."
- starts_with = list(/obj/item/voidsuit_modkit/sfa = 4)
-
/obj/item/storage/box/dominianvoid
name = "dominian voidsman's modkit box"
desc = "Contains modkits to convert Dominian voidsuits into a voidsman's variant."
starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4)
-/obj/item/storage/box/tarwa
- name = "tarwa conglomerate modkit box"
- desc = "Contains modkits to convert Unathi pirate voidsuits into a Tarwa Conglomerate variant."
- starts_with = list(/obj/item/voidsuit_modkit/tarwa = 4)
+/obj/item/storage/box/species_modkit
+ name = "multi-species modkit box"
+ desc = "Contains modkits to convert a voidsuit to a wide range of available species."
+ starts_with = list(/obj/item/device/modkit/multi_species = 4)
-/obj/item/storage/box/kazu
- name = "kazu's techraiders modkit box"
- desc = "Contains modkits to convert Unathi pirate voidsuits into a Techraider variant."
- starts_with = list(/obj/item/voidsuit_modkit/kazu = 4)
+/obj/item/storage/box/unathi_modkit
+ name = "multi-species modkit box"
+ desc = "Contains modkits to convert a voidsuit for an Unathi wearer."
+ starts_with = list(/obj/item/device/modkit/unathi = 4)
-/obj/item/storage/box/hiskyn
- name = "hiskyn revanchists modkit box"
- desc = "Contains modkits to convert Unathi pirate voidsuits into a Hiskyn Revanchist variant."
- starts_with = list(/obj/item/voidsuit_modkit/hiskyn = 4)
+/obj/item/storage/box/ipc_modkit
+ name = "ipc modkit box"
+ desc = "Contains modkits to convert a voidsuit for an IPC wearer."
+ starts_with = list(/obj/item/device/modkit/ipc = 4)
-/obj/item/storage/box/nanotrasen_nexus
- name = "\improper Nexus modkit box"
- desc = "Contains modkits to convert NanoTrasen hardsuits into a Nexus variant."
- starts_with = list(/obj/item/voidsuit_modkit/nexus = 4)
+/obj/item/voidsuit_modkit_multi //for converting between a large range of options instead of having 5000 subtypes
+ name = "voidsuit kit"
+ icon = 'icons/obj/device.dmi'
+ icon_state = "modkit"
+ desc = "A simple cardboard box designed to modify a voidsuit to a selection of alternate options."
+ desc_info = "In order to convert a voidsuit simply click on voidsuit or helmet with this item\
+ The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit\
+ or else it will be deleted."
+ w_class = ITEMSIZE_SMALL
+ var/list/suit_options = list()
+ var/list/helmet_options = list()
+ var/list/rig_options = list()
+ var/parts = MODKIT_FULL
-/obj/item/storage/box/nanotrasen_auxiliary
- name = "\improper NanoTrasen corporate auxiliary modkit box"
- desc = "Contains modkits to convert NanoTrasen hardsuits into an NT corporate auxiliary variant."
- starts_with = list(/obj/item/voidsuit_modkit/nt_auxiliary = 4)
+/obj/item/voidsuit_modkit_multi/afterattack(obj/item/W as obj, mob/user as mob, proximity)
+ if(!proximity)
+ return
+ if(!parts)
+ to_chat(user, "This kit has no parts for this modification left.")
+ user.drop_from_inventory(src,W)
+ qdel(src)
+ return
+
+ if(!(W.type in suit_options) && !(W.type in helmet_options))
+ return
+
+ var/voidsuit_product
+ if(istype(W, /obj/item/clothing/suit/space/void))
+ var/suit_choice = tgui_input_list(user, "Select a suit modification:", "Voidsuit Modkit", suit_options)
+ voidsuit_product = suit_options[suit_choice]
+ else if(istype(W, /obj/item/clothing/head/helmet/space/void))
+ var/helmet_choice = tgui_input_list(user, "Select a helmet modification:", "Voidsuit Modkit", helmet_options)
+ voidsuit_product = suit_options[helmet_choice]
+ else if(istype(W, /obj/item/rig))
+ var/rig_choice = tgui_input_list(user, "Select a hardsuit modification:", "Voidsuit Modkit", rig_options)
+ voidsuit_product = rig_options[rig_choice]
+ if(voidsuit_product)
+ if(istype(W, /obj/item/clothing/suit/space/void) && W.contents.len)
+ to_chat(user, SPAN_NOTICE("Remove any accessories, helmets, magboots, or oxygen tanks before attempting to convert this voidsuit."))
+ return
+ playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
+ var/obj/item/P = new voidsuit_product(get_turf(W))
+ to_chat(user, SPAN_NOTICE("Your voidsuit part has been reconverted into [P]."))
+
+ if(istype(W, /obj/item/clothing/head/helmet))
+ parts &= ~MODKIT_HELMET
+ if(istype(W, /obj/item/clothing/suit))
+ parts &= ~MODKIT_SUIT
+ if(istype(W, /obj/item/rig))
+ parts &= ~MODKIT_RIG
+
+ qdel(W)
+
+ if(!parts)
+ user.drop_from_inventory(src)
+ qdel(src)
+
+/obj/item/voidsuit_modkit_multi/sol_warlord
+ name = "solarian warlord modkit"
+ desc = "A highly complicated device that allows you to convert a Solarian voidsuit into a warlord variant. Wow!"
+ desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
+ The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
+ or else it will be deleted."
+ suit_options = list(
+ "Solarian Armed Forces" = /obj/item/clothing/suit/space/void/sol,
+ "Free Solarian Fleets" = /obj/item/clothing/suit/space/void/sol/fsf,
+ "League of Corporate-Free Systems" = /obj/item/clothing/suit/space/void/sol/league,
+ "Middle Ring Shield Pact" = /obj/item/clothing/suit/space/void/sol/mrsp,
+ "Southern Fleet Administration" = /obj/item/clothing/suit/space/void/sol/sfa,
+ "Solarian Provisional Government" = /obj/item/clothing/suit/space/void/sol/spg,
+ "Solarian Restoration Front" = /obj/item/clothing/suit/space/void/sol/srf,
+ "Southern Solarian Military District" = /obj/item/clothing/suit/space/void/sol/ssmd
+ )
+ helmet_options = list(
+ "Solarian Armed Forces" = /obj/item/clothing/head/helmet/space/void/sol,
+ "Free Solarian Fleets" = /obj/item/clothing/head/helmet/space/void/sol/fsf,
+ "League of Corporate-Free Systems" = /obj/item/clothing/head/helmet/space/void/sol/league,
+ "Middle Ring Shield Pact" = /obj/item/clothing/head/helmet/space/void/sol/mrsp,
+ "Southern Fleet Administration" = /obj/item/clothing/head/helmet/space/void/sol/sfa,
+ "Solarian Provisional Government" = /obj/item/clothing/head/helmet/space/void/sol/spg,
+ "Solarian Restoration Front" = /obj/item/clothing/head/helmet/space/void/sol/srf,
+ "Southern Solarian Military District" = /obj/item/clothing/head/helmet/space/void/sol/ssmd
+ )
+
+/obj/item/voidsuit_modkit_multi/unathi_pirate
+ name = "unathi pirate modkit"
+ desc = "A highly complicated device that allows you to convert an Unathi pirate suit into another fleet's counterpart. Practical!"
+ desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item \
+ The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \
+ or else it will be deleted."
+ w_class = ITEMSIZE_SMALL
+ suit_options = list(
+ "Izharshan's Raiders" = /obj/item/clothing/suit/space/void/unathi_pirate,
+ "Hiskyn's Revanchists" = /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn,
+ "Kazu's Techraiders" = /obj/item/clothing/suit/space/void/unathi_pirate/kazu,
+ "Tarwa Conglomerate" = /obj/item/clothing/suit/space/void/unathi_pirate/tarwa
+ )
+ helmet_options = list(
+ "Izharshan's Raiders" = /obj/item/clothing/head/helmet/space/void/unathi_pirate,
+ "Hiskyn's Revanchists" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/hiskyn,
+ "Kazu's Techraiders" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu,
+ "Tarwa Conglomerate" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/tarwa
+ )
+
+/obj/item/voidsuit_modkit_multi/unathi_pirate/captain
+ name = "unathi pirate captain modkit"
+ suit_options = list(
+ "Izharshan's Raiders" = /obj/item/clothing/suit/space/void/unathi_pirate/captain,
+ "Hiskyn's Revanchists" = /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn/captain,
+ "Kazu's Techraiders" = /obj/item/clothing/suit/space/void/unathi_pirate/kazu/captain,
+ "Tarwa Conglomerate" = /obj/item/clothing/suit/space/void/unathi_pirate/tarwa/captain
+ )
+ helmet_options = list(
+ "Izharshan's Raiders" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/captain,
+ "Hiskyn's Revanchists" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/hiskyn/captain,
+ "Kazu's Techraiders" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/kazu/captain,
+ "Tarwa Conglomerate" = /obj/item/clothing/head/helmet/space/void/unathi_pirate/tarwa/captain
+ )
+
+/obj/item/voidsuit_modkit_multi/nanotrasen
+ name = "\improper NanoTrasen hardsuit modkit"
+ desc = "A highly complicated device that allows you to convert a NanoTrasen hardsuit into its corporate auxiliary or Nexus Security variant. Wow!"
+ desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on a hardsuit with this item \
+ The same process can be used to convert the hardsuit back into a regular hardsuit. Make sure not to have any modules in the suit \
+ or else it will be deleted."
+ w_class = ITEMSIZE_SMALL
+ rig_options = list(
+ "NanoTrasen Hardsuit" = /obj/item/rig/nanotrasen,
+ "Corporate Auxiliary Hardsuit" = /obj/item/rig/nanotrasen/corporate_auxiliary,
+ "Nexus Security Hardsuit" = /obj/item/rig/nanotrasen/nexus
+ )
+
+/obj/item/storage/box/unathi_pirate
+ name = "unathi pirate modkit box"
+ desc = "Contains modkits to convert Unathi pirate voidsuits into fleet variants."
+ starts_with = list(/obj/item/voidsuit_modkit_multi/unathi_pirate = 4)
+
+/obj/item/storage/box/sol_warlord
+ name = "solarian warlord modkit box"
+ desc = "Contains modkits to convert Solarian voidsuits into warlord variants."
+ starts_with = list(/obj/item/voidsuit_modkit_multi/sol_warlord = 4)
+
+/obj/item/storage/box/nanotrasen_hardsuit
+ name = "nanotrasen modkit box"
+ desc = "Contains modkits to convert NanoTrasen hardsuits into alternate variants."
+ starts_with = list(/obj/item/voidsuit_modkit_multi/nanotrasen = 4)
#undef MODKIT_HELMET
#undef MODKIT_SUIT
diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
index 3568e0d05a3..4d4aa2e2c30 100644
--- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
@@ -66,6 +66,7 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
+ new /obj/item/storage/box/species_modkit(src)
/obj/structure/closet/crate/secure/gear_loadout/coalition_single/fill()
new /obj/item/clothing/head/helmet/space/void/coalition(src)
@@ -76,6 +77,7 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
+ new /obj/item/device/modkit/multi_species(src)
/obj/structure/closet/crate/secure/gear_loadout/eridani/fill()
new /obj/item/clothing/under/rank/security/pmc/epmc(src)
@@ -154,6 +156,7 @@
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
+ new /obj/item/storage/box/ipc_modkit(src)
/obj/structure/closet/crate/secure/gear_loadout/elyra_single/fill()
new /obj/item/clothing/head/helmet/space/void/valkyrie(src)
@@ -164,6 +167,7 @@
new /obj/item/gun/projectile/pistol(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
+ new /obj/item/device/modkit/ipc(src)
/obj/structure/closet/crate/secure/gear_loadout/sol/fill()
new /obj/item/clothing/under/rank/sol/marine(src)
@@ -200,13 +204,7 @@
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/ammo_magazine/mc9mm(src)
- new /obj/item/storage/box/srf(src)
- new /obj/item/storage/box/league(src)
- new /obj/item/storage/box/fsf(src)
- new /obj/item/storage/box/ssmd(src)
- new /obj/item/storage/box/spg(src)
- new /obj/item/storage/box/mrsp(src)
- new /obj/item/storage/box/sfa(src)
+ new /obj/item/storage/box/sol_warlord(src)
/obj/structure/closet/crate/secure/gear_loadout/sol_single/fill()
new /obj/item/clothing/under/rank/sol/marine(src)
@@ -217,13 +215,7 @@
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/gun/projectile/pistol/sol(src)
new /obj/item/ammo_magazine/mc9mm(src)
- new /obj/item/storage/box/srf(src)
- new /obj/item/storage/box/league(src)
- new /obj/item/storage/box/fsf(src)
- new /obj/item/storage/box/ssmd(src)
- new /obj/item/storage/box/spg(src)
- new /obj/item/storage/box/mrsp(src)
- new /obj/item/storage/box/sfa(src)
+ new /obj/item/voidsuit_modkit_multi/sol_warlord(src)
/obj/structure/closet/crate/secure/gear_loadout/syndicate_softsuits
req_access = list()
@@ -296,17 +288,18 @@
new /obj/item/clothing/suit/space/void/zenghu(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/clothing/shoes/magboots(src)
+ new /obj/item/device/modkit/skrell(src)
/obj/structure/closet/crate/gear_loadout/nanotrasen/suit/fill()
new /obj/item/rig/nanotrasen(src)
- new /obj/item/voidsuit_modkit/nexus(src)
- new /obj/item/voidsuit_modkit/nt_auxiliary(src)
+ new /obj/item/voidsuit_modkit_multi/nanotrasen(src)
/obj/structure/closet/crate/gear_loadout/hephaestus/fill()
new /obj/item/clothing/head/helmet/space/void/hephaestus(src)
new /obj/item/clothing/suit/space/void/hephaestus(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/clothing/shoes/magboots(src)
+ new /obj/item/device/modkit/unathi(src)
/obj/structure/closet/crate/gear_loadout/einstein/suit/fill()
new /obj/item/clothing/head/helmet/space/void/einstein(src)
@@ -365,6 +358,7 @@
new /obj/item/shield/energy/dominia(src)
new /obj/item/shield/energy/dominia(src)
new /obj/item/storage/box/dominianvoid(src)
+ new /obj/item/storage/box/unathi_modkit(src)
/obj/structure/closet/crate/secure/gear_loadout/dominia/single/fill()
new /obj/item/clothing/under/dominia/fleet(src)
@@ -377,6 +371,7 @@
new /obj/item/melee/energy/sword/pirate(src)
new /obj/item/shield/energy/dominia(src)
new /obj/item/voidsuit_modkit/dominianvoid(src)
+ new /obj/item/device/modkit/unathi(src)
/obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/fill()
new /obj/item/clothing/under/tajaran/cosmonaut(src)
@@ -706,9 +701,8 @@
new /obj/item/ammo_magazine/c38(src)
new /obj/item/ammo_magazine/c45m(src)
new /obj/item/ammo_magazine/c45m(src)
- new /obj/item/storage/box/tarwa(src)
- new /obj/item/storage/box/kazu(src)
- new /obj/item/storage/box/hiskyn(src)
+ new /obj/item/storage/box/unathi_pirate(src)
+ new /obj/item/voidsuit_modkit_multi/unathi_pirate/captain(src)
/obj/structure/closet/crate/secure/gear_loadout/unathi_pirate/single/fill()
new /obj/item/clothing/under/unathi(src)
@@ -722,9 +716,7 @@
new /obj/item/ammo_magazine/c38(src)
new /obj/item/storage/box/shotgunshells(src)
new /obj/item/storage/box/shotgunshells(src)
- new /obj/item/voidsuit_modkit/tarwa(src)
- new /obj/item/voidsuit_modkit/kazu(src)
- new /obj/item/voidsuit_modkit/hiskyn(src)
+ new /obj/item/voidsuit_modkit_multi/unathi_pirate(src)
/obj/structure/closet/crate/secure/gear_loadout/pvsm/fill()
new /obj/item/clothing/under/tajaran/pvsm(src)
@@ -788,8 +780,7 @@
new /obj/item/rig/nanotrasen(src)
new /obj/item/rig/nanotrasen(src)
new /obj/item/rig/nanotrasen(src)
- new /obj/item/storage/box/nanotrasen_nexus(src)
- new /obj/item/storage/box/nanotrasen_auxiliary(src)
+ new /obj/item/storage/box/nanotrasen_hardsuit(src)
new /obj/item/gun/energy/laser/shotgun(src)
new /obj/item/gun/energy/laser/shotgun(src)
new /obj/item/gun/energy/rifle(src)
@@ -807,8 +798,7 @@
/obj/structure/closet/crate/gear_loadout/nanotrasen/single/fill()
new /obj/item/rig/nanotrasen(src)
- new /obj/item/voidsuit_modkit/nexus(src)
- new /obj/item/voidsuit_modkit/nt_auxiliary(src)
+ new /obj/item/voidsuit_modkit_multi/nanotrasen(src)
new /obj/item/gun/energy/rifle(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/shield/riot/tact(src)
@@ -819,8 +809,8 @@
for(i=0, i<6, i++) //6 outfits
new /obj/item/clothing/under/syndicate/hammertail(src)
for(i=0, i<4, i++) //4 voidsuits w/helmets
- new /obj/item/clothing/head/helmet/space/void/merc/unathi(src)
- new /obj/item/clothing/suit/space/void/merc/unathi(src)
+ new /obj/item/clothing/head/helmet/space/void/merc(src)
+ new /obj/item/clothing/suit/space/void/merc(src)
for(i=0, i<4, i++) //4 e-swords
new /obj/item/melee/energy/sword(src)
for(i=0, i<4, i++) //4 heavy pistols w/spare magazines
@@ -832,6 +822,7 @@
for(i=0, i<2, i++) //2 assault rifles w/spare magazines
new /obj/item/gun/projectile/automatic/rifle/sts35(src)
new /obj/item/ammo_magazine/c762(src)
+ new /obj/item/storage/box/species_modkit(src) //species modkits for switching on the fly
/obj/structure/closet/crate/secure/gear_loadout/hammertail/single/fill()
new /obj/item/clothing/under/syndicate/hammertail(src) //1 outfit
@@ -842,6 +833,7 @@
new /obj/item/ammo_magazine/a357(src)
new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine
new /obj/item/ammo_magazine/gauss(src)
+ new /obj/item/device/modkit/multi_species(src)
/obj/structure/closet/crate/gear_loadout/qukala/fill()
new /obj/item/clothing/under/skrell/qukala(src)
@@ -1014,6 +1006,7 @@
new /obj/item/storage/backpack/tcaf(src)
new /obj/item/storage/backpack/tcaf(src)
new /obj/item/storage/backpack/tcaf(src)
+ new /obj/item/storage/box/species_modkit(src)
/obj/structure/closet/crate/secure/gear_loadout/tcaf/single/fill()
new /obj/item/clothing/under/legion/tcaf(src)
@@ -1032,6 +1025,7 @@
new /obj/item/clothing/head/helmet/tcaf/tcaf_visor(src)
new /obj/item/gun/energy/blaster/tcaf(src)
new /obj/item/storage/belt/military(src)
+ new /obj/item/device/modkit/multi_species(src)
/obj/structure/closet/crate/secure/gear_loadout/exclusionist/fill()
new /obj/item/clothing/under/gearharness(src)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d79d40ba219..8c668b7c492 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -22,6 +22,8 @@
var/species_sprite_adaption_type = WORN_UNDER
+ var/list/refittable_species //used with modkits, which species it can be refit to
+
//material things
var/material/material = null
var/applies_material_color = TRUE
@@ -192,6 +194,51 @@
else
icon = initial(icon)
+/obj/item/clothing/proc/refit_contained(var/target_species)
+ if(!species_restricted || !contained_sprite)
+ return
+
+ var/species_short = GLOB.all_species_bodytypes[target_species]
+ if(species_short && !(species_short in icon_supported_species_tags)) //if it's empty it's for human, but otherwise it needs to be in there
+ return
+ switch(target_species)
+ if(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL) //humanoid bodies
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
+ if(BODYTYPE_IPC) //ipc suits can fit on all ipcs
+ species_restricted = list(BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
+ else
+ species_restricted = list(target_species)
+ icon_species_tag = species_short
+ var/list/all_icon_states = icon_states(icon)
+ if(!("[UNDERSCORE_OR_NULL(species_short)][icon_state][WORN_LHAND]" in all_icon_states)) //if no left hand, probably no right hand
+ item_state_slots = list( //done in order to prevent inhands from being overridden here
+ slot_r_hand_str = item_state,
+ slot_l_hand_str = item_state
+ )
+ if("[UNDERSCORE_OR_NULL(species_short)][icon_state]" in all_icon_states)
+ icon_state = "[UNDERSCORE_OR_NULL(species_short)][icon_state]"
+ item_state = "[UNDERSCORE_OR_NULL(species_short)]icon_state]"
+
+/obj/item/clothing/head/helmet/refit_contained(var/target_species)
+ if(!species_restricted || !contained_sprite)
+ return
+ var/species_short = GLOB.all_species_bodytypes[target_species]
+ if(species_short && !(species_short in icon_supported_species_tags)) //if it's empty it's for human, but otherwise it needs to be in there
+ return
+ switch(target_species)
+ if(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
+ else
+ species_restricted = list(target_species)
+ var/list/all_icon_states = icon_states(icon)
+ if(!("[UNDERSCORE_OR_NULL(species_short)][icon_state][WORN_LHAND]" in all_icon_states)) //if no left hand, probably no right hand
+ item_state_slots = list( //done in order to prevent inhands from being overridden here
+ slot_r_hand_str = item_state,
+ slot_l_hand_str = item_state
+ )
+ if("[UNDERSCORE_OR_NULL(species_short)][icon_state]" in all_icon_states)
+ icon_state = "[UNDERSCORE_OR_NULL(species_short)][icon_state]"
+ item_state = "[UNDERSCORE_OR_NULL(species_short)]icon_state]"
//material related procs
/obj/item/clothing/get_material()
@@ -640,7 +687,7 @@
var/image/our_image
if(contained_sprite)
auto_adapt_species(src)
- var/state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][item_state][WORN_HEAD]"
+ var/state = "[icon_state][WORN_HEAD]"
our_image = image(icon_override || icon, state)
else if(icon_override)
our_image = image(icon_override, icon_state)
@@ -1004,7 +1051,7 @@
var/image/our_image
if(contained_sprite)
auto_adapt_species(src)
- var/state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][item_state][WORN_SUIT]"
+ var/state = "[icon_state][WORN_SUIT]"
our_image = image(icon_override || icon, state)
else if(icon_override)
our_image = image(icon_override, icon_state)
@@ -1189,7 +1236,7 @@
var/image/our_image
if(contained_sprite)
auto_adapt_species(src)
- var/state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][item_state][WORN_UNDER]"
+ var/state = "[item_state][WORN_UNDER]"
our_image = image(icon_override || icon, state)
else if(icon_override)
our_image = image(icon_override, icon_state)
diff --git a/code/modules/clothing/spacesuits/rig/rig_construction.dm b/code/modules/clothing/spacesuits/rig/rig_construction.dm
index 573f1a5d3d0..b846062cd55 100644
--- a/code/modules/clothing/spacesuits/rig/rig_construction.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_construction.dm
@@ -104,6 +104,7 @@
icon_state = "industrial1"
board_type = /obj/item/circuitboard/rig_assembly/civilian/industrial
rig_type = /obj/item/rig/industrial
+ convert_options = list(/obj/item/rig_assembly/industrial/himeo)
/obj/item/rig_assembly/industrial/himeo
name = "himean industrial suit control module assembly"
@@ -112,6 +113,7 @@
icon_state = "himeo1"
board_type = /obj/item/circuitboard/rig_assembly/civilian/industrial
rig_type = /obj/item/rig/industrial/himeo
+ convert_options = list(/obj/item/rig_assembly/industrial)
/obj/item/rig_assembly/hazmat
name = "AMI control module assembly"
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index d53be02382e..687b1cecce1 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -36,7 +36,8 @@
/obj/item/clothing/head/helmet/space/Initialize()
. = ..()
- build_and_apply_species_adaption()
+ if(icon_auto_adapt)
+ build_and_apply_species_adaption()
/obj/item/clothing/suit/space
name = "softsuit"
@@ -70,7 +71,8 @@
/obj/item/clothing/suit/space/Initialize()
. = ..()
- build_and_apply_species_adaption()
+ if(icon_auto_adapt)
+ build_and_apply_species_adaption()
/obj/item/clothing/suit/space/equipped(mob/M)
check_limb_support()
diff --git a/code/modules/clothing/spacesuits/void/alien/skrell.dm b/code/modules/clothing/spacesuits/void/alien/skrell.dm
index 37b523b0e0a..b56b2a94578 100644
--- a/code/modules/clothing/spacesuits/void/alien/skrell.dm
+++ b/code/modules/clothing/spacesuits/void/alien/skrell.dm
@@ -65,6 +65,7 @@
rad = ARMOR_RAD_SHIELDED
)
species_restricted = list(BODYTYPE_SKRELL)
+ refittable = FALSE
/obj/item/clothing/head/helmet/space/void/kala
name = "qukala voidsuit helmet"
@@ -83,6 +84,7 @@
rad = ARMOR_RAD_SHIELDED
)
species_restricted = list(BODYTYPE_SKRELL)
+ refittable = FALSE
/obj/item/clothing/suit/space/void/kala/med
name = "qukala medical voidsuit"
diff --git a/code/modules/clothing/spacesuits/void/alien/unathi.dm b/code/modules/clothing/spacesuits/void/alien/unathi.dm
index d552437b029..295ab271498 100644
--- a/code/modules/clothing/spacesuits/void/alien/unathi.dm
+++ b/code/modules/clothing/spacesuits/void/alien/unathi.dm
@@ -1,10 +1,10 @@
/obj/item/clothing/head/helmet/space/void/kataphract
name = "kataphract voidsuit helmet"
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony."
- icon = 'icons/obj/clothing/species/unathi/hats.dmi'
- icon_override = 'icons/mob/species/unathi/helmet.dmi'
- icon_state = "rig0-kataphract"
- item_state = "rig0-kataphract"
+ icon = 'icons/obj/clothing/voidsuit/hegemony.dmi'
+ icon_state = "kataphract_helm"
+ item_state = "kataphract_helm"
+ contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_VERY_HIGH,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -21,10 +21,10 @@
/obj/item/clothing/suit/space/void/kataphract
name = "kataphract voidsuit"
desc = "A large suit of spaceproof armor, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony."
- icon = 'icons/obj/clothing/species/unathi/suits.dmi'
- icon_override = 'icons/mob/species/unathi/suit.dmi'
- icon_state = "rig-kataphract"
- item_state = "rig-kataphract"
+ icon = 'icons/obj/clothing/voidsuit/hegemony.dmi'
+ icon_state = "kataphract"
+ item_state = "kataphract"
+ contained_sprite = TRUE
slowdown = 1
w_class = ITEMSIZE_NORMAL
armor = list(
@@ -44,26 +44,26 @@
/obj/item/clothing/head/helmet/space/void/kataphract/spec
name = "kataphract specialist voidsuit helmet"
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist."
- icon_state = "rig0-kataphract-spec"
- item_state = "rig0-kataphract-spec"
+ icon_state = "kataphract-spec_helm"
+ item_state = "kataphract-spec_helm"
/obj/item/clothing/suit/space/void/kataphract/spec
name = "kataphract specialist voidsuit"
desc = "A large suit of spaceproof armor, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist."
- icon_state = "rig-kataphract-spec"
- item_state = "rig-kataphract-spec"
+ icon_state = "kataphract-spec"
+ item_state = "kataphract-spec"
/obj/item/clothing/head/helmet/space/void/kataphract/lead
name = "kataphract knight voidsuit helmet"
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight."
- icon_state = "rig0-kataphract-lead"
- item_state = "rig0-kataphract-lead"
+ icon_state = "kataphract-lead_helm"
+ item_state = "kataphract-lead_helm"
/obj/item/clothing/suit/space/void/kataphract/lead
name = "kataphract knight voidsuit"
desc = "A large suit of spaceproof armor, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight."
- icon_state = "rig-kataphract-lead"
- item_state = "rig-kataphract-lead"
+ icon_state = "kataphract-lead"
+ item_state = "kataphract-lead"
/obj/item/clothing/head/helmet/space/void/unathi_pirate
name = "unathi raider helmet"
@@ -137,7 +137,7 @@
desc = "A Hephaestus-manufactured armoured voidsuit, made for Unathi. The standard spacefaring attire of the Izweski Hegemony Navy."
icon = 'icons/obj/clothing/voidsuit/hegemony.dmi'
icon_state = "hegemony-voidsuit"
- item_state = "hegemony-voidsuit_item"
+ item_state = "hegemony-voidsuit"
w_class = ITEMSIZE_NORMAL
armor = list(
diff --git a/code/modules/clothing/spacesuits/void/captain.dm b/code/modules/clothing/spacesuits/void/captain.dm
index 86683b6855b..451a3bb7623 100644
--- a/code/modules/clothing/spacesuits/void/captain.dm
+++ b/code/modules/clothing/spacesuits/void/captain.dm
@@ -1,9 +1,12 @@
//Captain's voidsuit
/obj/item/clothing/head/helmet/space/void/captain
name = "captain voidsuit helmet"
- icon_state = "capspace"
- item_state = "capspace"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
+ icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
+ icon_state = "captain_helm"
+ item_state = "captain_helm"
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
@@ -14,16 +17,16 @@
rad = ARMOR_RAD_RESISTANT
)
siemens_coefficient = 0.35
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/captain
name = "captain voidsuit"
desc = "A bulky, heavy-duty piece of exclusive SCC armor. YOU are in charge!"
- icon_state = "capspace"
- item_state = "capspace"
- item_state_slots = list(
- slot_l_hand_str = "capspacesuit",
- slot_r_hand_str = "capspacesuit"
- )
+ icon = 'icons/obj/clothing/voidsuit/station/captain.dmi'
+ icon_state = "captain"
+ item_state = "captain"
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
w_class = ITEMSIZE_LARGE
allowed = list(/obj/item/tank, /obj/item/device/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs)
slowdown = 1.5
@@ -37,3 +40,4 @@
rad = ARMOR_RAD_RESISTANT
)
siemens_coefficient = 0.35
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm
index 10cb0efea4a..4ecefec8422 100644
--- a/code/modules/clothing/spacesuits/void/merc.dm
+++ b/code/modules/clothing/spacesuits/void/merc.dm
@@ -2,12 +2,12 @@
/obj/item/clothing/head/helmet/space/void/merc
name = "blood-red voidsuit helmet"
desc = "An advanced helmet designed for work in special operations. Property of Hammertail Smiths."
- icon_state = "rig0-syndie"
+ icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
+ icon_state = "syndie_helm"
item_state = "syndie_helm"
- item_state_slots = list(
- slot_l_hand_str = "syndie_helm",
- slot_r_hand_str = "syndie_helm"
- )
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -27,12 +27,11 @@
/obj/item/clothing/suit/space/void/merc
name = "blood-red voidsuit"
desc = "An advanced suit that protects against injuries during special operations. Property of Hammertail Smiths."
- icon_state = "rig-syndie"
- item_state = "rig-syndie"
- item_state_slots = list(
- slot_l_hand_str = "syndie_hardsuit",
- slot_r_hand_str = "syndie_hardsuit"
- )
+ icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
+ icon_state = "syndie"
+ item_state = "syndie"
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
slowdown = 1
w_class = ITEMSIZE_NORMAL
armor = list(
@@ -47,11 +46,12 @@
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/head/helmet/space/void/merc/unathi/Initialize()
. = ..()
- refit_for_species(BODYTYPE_UNATHI)
+ refit_contained(BODYTYPE_UNATHI)
/obj/item/clothing/suit/space/void/merc/unathi/Initialize()
. = ..()
- refit_for_species(BODYTYPE_UNATHI)
+ refit_contained(BODYTYPE_UNATHI)
diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm
index 237a6e951be..e3ad1bf70f1 100644
--- a/code/modules/clothing/spacesuits/void/misc.dm
+++ b/code/modules/clothing/spacesuits/void/misc.dm
@@ -60,10 +60,10 @@
rad = ARMOR_RAD_SMALL
)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC, BODYTYPE_SKRELL, BODYTYPE_TAJARA)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
icon_supported_species_tags = list("ipc", "skr", "taj")
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_SKRELL)
+
brightness_on = 6
refittable = FALSE
@@ -88,11 +88,9 @@
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC, BODYTYPE_SKRELL, BODYTYPE_TAJARA)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_SKRELL)
icon_supported_species_tags = list("ipc", "skr", "taj")
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_SKRELL)
/obj/item/clothing/head/helmet/space/void/coalition/xanu
name = "\improper Xanan eagle voidsuit helmet"
@@ -118,41 +116,15 @@
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL)
-/obj/item/clothing/head/helmet/space/void/himeo
- name = "\improper Himean buzzard voidsuit helmet"
- desc = "A hardy voidsuit helmet designed specifically for the Himean Planetary Guard. Based on the iconic Vulture voidsuit, and modelled after the Eagle, it boasts improved armor at the cost of weight."
- desc_extended = "While the Vulture remains the most popular voidsuit in the Coalition, the Free Consortium of Defense and Aerospace Manufacturers has long sought improvements. As the Xanan \"Eagle\" remains costly to import, the \
- Type-97 \"Buzzard\" provides outstanding protections against the rigors of void combat at the cost of maneuverability. Naval boarding teams are fond of it; the inhuman faceplate and intimidating stature have led to more than \
- one surrender without a single shot being fired."
- icon = 'icons/obj/clothing/voidsuit/himeo.dmi'
- icon_state = "himeo_void_helmet"
- item_state = "himeo_void_helmet"
- contained_sprite = TRUE
- armor = list(
- melee = ARMOR_MELEE_MAJOR,
- bullet = ARMOR_BALLISTIC_CARBINE,
- laser = ARMOR_LASER_SMALL,
- energy = ARMOR_ENERGY_MINOR,
- bomb = ARMOR_BOMB_RESISTANT,
- bio = ARMOR_BIO_SHIELDED,
- rad = ARMOR_RAD_SMALL
- )
- light_overlay = "helmet_light_himeo_voidsuit"
- siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC)
- refittable = FALSE
-
-/obj/item/clothing/suit/space/void/himeo
+/obj/item/clothing/suit/space/void/coalition/himeo
name = "\improper Himean buzzard voidsuit"
desc = "A hardy voidsuit designed specifically for the Himean Planetary Guard. Based on the iconic Vulture voidsuit, and modelled after the Eagle, it boasts improved armor at the cost of weight."
desc_extended = "While the Vulture remains the most popular voidsuit in the Coalition, the Free Consortium of Defense and Aerospace Manufacturers has long sought improvements. As the Xanan \"Eagle\" remains costly to import, the \
Type-97 \"Buzzard\" provides outstanding protections against the rigors of void combat at the cost of maneuverability. Naval boarding teams are fond of it; the inhuman faceplate and intimidating stature have led to more than \
one surrender without a single shot being fired."
- icon = 'icons/obj/clothing/voidsuit/himeo.dmi'
icon_state = "himeo_voidsuit"
item_state = "himeo_voidsuit"
- contained_sprite = 1
- slowdown = 1
+ slowdown = 1.5
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_CARBINE,
@@ -175,18 +147,39 @@
)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC)
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC)
+ icon_supported_species_tags = list("taj")
-/obj/item/clothing/head/helmet/space/void/galatea
+/obj/item/clothing/head/helmet/space/void/coalition/himeo
+ name = "\improper Himean buzzard helmet"
+ desc = "A hardy voidsuit helmet designed specifically for the Himean Planetary Guard. Based on the iconic Vulture voidsuit, and modelled after the Eagle, it boasts improved armor at the cost of weight."
+ desc_extended = "While the Vulture remains the most popular voidsuit in the Coalition, the Free Consortium of Defense and Aerospace Manufacturers has long sought improvements. As the Xanan \"Eagle\" remains costly to import, the \
+ Type-97 \"Buzzard\" provides outstanding protections against the rigors of void combat at the cost of maneuverability. Naval boarding teams are fond of it; the inhuman faceplate and intimidating stature have led to more than \
+ one surrender without a single shot being fired."
+ icon_state = "himeo_void_helmet"
+ item_state = "himeo_void_helmet"
+ armor = list(
+ melee = ARMOR_MELEE_MAJOR,
+ bullet = ARMOR_BALLISTIC_CARBINE,
+ laser = ARMOR_LASER_SMALL,
+ energy = ARMOR_ENERGY_MINOR,
+ bomb = ARMOR_BOMB_RESISTANT,
+ bio = ARMOR_BIO_SHIELDED,
+ rad = ARMOR_RAD_SMALL
+ )
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC)
+ icon_supported_species_tags = list("taj")
+ brightness_on = 6
+ light_color = "#ffce01"
+
+/obj/item/clothing/head/helmet/space/void/coalition/galatea
name = "\improper Galatean jackdaw helmet"
desc = "An unusual voidsuit helmet designed for Galatean naval forces. Features an advanced environmental shielding module and strengthened biohazard protocols."
desc_extended = "The Federal Technocracy of Galatea is unusual in that they did not base their voidsuit on the Vulture model, opting to start fresh with the \"Jackdaw\". Based on softsuit \
designs from the days of the Galatea Project, the Jackdaw has an incredibly advanced 'user protection suite' that shields the occupant from radiation, biohazards, and exotic particles, at the cost of \
combat protection."
- icon = 'icons/obj/clothing/voidsuit/galatea.dmi'
icon_state = "galatea_void_helmet"
item_state = "galatea_void_helmet"
- contained_sprite = TRUE
slowdown = 0.65
permeability_coefficient = 0
gas_transfer_coefficient = 0
@@ -203,16 +196,14 @@
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC)
refittable = FALSE
-/obj/item/clothing/suit/space/void/galatea
+/obj/item/clothing/suit/space/void/coalition/galatea
name = "\improper Galatean jackdaw voidsuit"
desc = "An unusual voidsuit designed for Galatean naval forces. Features an advanced environmental shielding module and strengthened biohazard protocols."
desc_extended = "The Federal Technocracy of Galatea is unusual in that they did not base their voidsuit on the Vulture model, opting to start fresh with the \"Jackdaw\". Based on softsuit \
designs from the days of the Galatea Project, the Jackdaw has an incredibly advanced 'user protection suite' that shields the occupant from radiation, biohazards, and exotic particles, at the cost of \
combat protection."
- icon = 'icons/obj/clothing/voidsuit/galatea.dmi'
icon_state = "galatea_voidsuit"
item_state = "galatea_voidsuit"
- contained_sprite = 1
slowdown = 0.65
permeability_coefficient = 0
gas_transfer_coefficient = 0
@@ -243,8 +234,10 @@
/obj/item/clothing/head/helmet/space/void/cruiser
name = "cruiser voidsuit helmet"
desc = "A silvery chrome, single visor space helmet with built-in peripherals and very bright fore lighting. A favorite of bounty hunters."
- icon_state = "eridani_suit"
- item_state = "eridani_suit"
+ icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+ icon_state = "cruiser_helm"
+ item_state = "cruiser_helm"
+ contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -263,8 +256,10 @@
/obj/item/clothing/suit/space/void/cruiser
name = "cruiser voidsuit"
desc = "A silvery chrome voidsuit with neon highlights. Utilized by Eridani private military and police."
- icon_state = "eridani_suit"
- item_state = "eridani_suit"
+ icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+ icon_state = "cruiser"
+ item_state = "cruiser"
+ contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -300,7 +295,8 @@
species_restricted = list(BODYTYPE_HUMAN)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
brightness_on = 6
- refittable = FALSE
+ icon_supported_species_tags = list("ipc")
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
/obj/item/clothing/suit/space/void/valkyrie
name = "valkyrie voidsuit"
@@ -322,14 +318,18 @@
allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN)
- refittable = FALSE
+ icon_supported_species_tags = list("ipc")
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000
/obj/item/clothing/head/helmet/space/void/lancer
name = "lancer voidsuit helmet"
desc = "A sleek helmet with a bright yellow visor, expertly made in and colored in the iconic branding of Ceres' Lance."
- icon_state = "lancer_suit"
- item_state = "lancer_suit"
+ icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+ icon_state = "lancer_helm"
+ item_state = "lancer_helm"
+ icon_supported_species_tags = list("una")
+ contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -341,18 +341,21 @@
)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN)
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
-/obj/item/clothing/head/helmet/space/void/lancer/unathi
+/obj/item/clothing/head/helmet/space/void/lancer/unathi/Initialize()
+ . = ..()
desc = "A sleek helmet with a bright yellow visor, expertly made in and colored in the iconic branding of Ceres' Lance. This one is fitted to Unathi."
- icon_override = 'icons/mob/species/unathi/helmet.dmi'
- species_restricted = list(BODYTYPE_UNATHI)
+ refit_contained(BODYTYPE_UNATHI)
/obj/item/clothing/suit/space/void/lancer
name = "lancer voidsuit"
desc = "A bulky void suit with heavy plating. Looks to be colored in the branding of Ceres' Lance."
- icon_state = "lancer_suit"
- item_state = "lancer_suit"
+ icon = 'icons/obj/clothing/voidsuit/megacorp.dmi'
+ icon_state = "lancer"
+ item_state = "lancer"
+ icon_supported_species_tags = list("una")
+ contained_sprite = TRUE
slowdown = 1
w_class = ITEMSIZE_NORMAL
armor = list(
@@ -367,12 +370,12 @@
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN)
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
-/obj/item/clothing/suit/space/void/lancer/unathi
+/obj/item/clothing/suit/space/void/lancer/unathi/Initialize()
+ . = ..()
desc = "A bulky void suit with heavy plating. Looks to be colored in the branding of Ceres' Lance. This one is fitted to Unathi."
- icon_override = 'icons/mob/species/unathi/suit.dmi'
- species_restricted = list(BODYTYPE_UNATHI)
+ refit_contained(BODYTYPE_UNATHI)
//Einstein Engines espionage voidsuit
/obj/item/clothing/head/helmet/space/void/einstein
@@ -443,15 +446,13 @@
rad = ARMOR_RAD_SMALL
)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_SKRELL)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
light_overlay = "helmet_light_dragon"
brightness_on = 6
light_color = "#7ffbf7"
desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit helmet. Its bug-eyed goggle visor design is unique among its class, alongside cutting-edge radiation protection."
- icon_auto_adapt = TRUE
icon_supported_species_tags = list("skr")
- icon_species_in_hand = TRUE
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/zenghu
name = "dragon biohazard control suit"
@@ -475,10 +476,8 @@
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_SKRELL)
desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors."
- icon_auto_adapt = TRUE
icon_supported_species_tags = list("skr")
- icon_species_in_hand = TRUE
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL)
//Hephaestus Industries espionage voidsuit
/obj/item/clothing/head/helmet/space/void/hephaestus
@@ -499,15 +498,13 @@
rad = ARMOR_RAD_SMALL
)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU, BODYTYPE_UNATHI)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU)
light_overlay = "helmet_light_caiman"
brightness_on = 6
light_color = "#ffce01"
desc_extended = "An easily recognized Hephaestus terraforming suit helmet. Its low, protruding brow and heavy plating is useful in the event you happen to be cutting down things. Mostly trees. Hopefully trees."
icon_supported_species_tags = list("una")
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
/obj/item/clothing/suit/space/void/hephaestus
name = "caiman drop suit"
@@ -529,12 +526,10 @@
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
desc_extended = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military."
icon_supported_species_tags = list("una")
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
- refittable = FALSE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
//Zavodskoi Interstellar espionage voidsuit
/obj/item/clothing/head/helmet/space/void/zavodskoi
@@ -589,8 +584,11 @@
/obj/item/clothing/head/helmet/space/void/freelancer
name = "armored voidsuit helmet"
desc = "A helmet from a commercial combat voidsuit design. Acceptably well-armored and prolific thoughout the Orion Spur, it can be seen in use by everyone from mercenaries to militia groups to police forces."
- icon_state = "rig0-freelancer"
-
+ icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
+ icon_state = "freelancer_helm"
+ item_state = "freelancer_helm"
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
@@ -605,13 +603,17 @@
light_overlay = "freelancer_light"
brightness_on = 6
light_color = "#7ffbf7"
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/freelancer
icon_state = "freelancer"
name = "armored voidsuit"
desc = "A suit from a commercial combat voidsuit design. Acceptably well-armored and prolific thoughout the Orion Spur, it can be seen in use by everyone from mercenaries to militia groups to police forces."
+ icon = 'icons/obj/clothing/voidsuit/mercenary.dmi'
+ icon_state = "freelancer"
item_state = "freelancer"
-
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
slowdown = 1
w_class = ITEMSIZE_NORMAL
armor = list(
@@ -626,6 +628,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/head/helmet/space/void/dominia
name = "dominian prejoroub combat helmet"
@@ -648,7 +651,7 @@
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
brightness_on = 6
icon_supported_species_tags = list("una")
- icon_auto_adapt = TRUE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
/obj/item/clothing/head/helmet/space/void/dominia/voidsman
name = "dominian voidsman helmet"
@@ -657,7 +660,6 @@
item_state = "voidsmanhelm"
species_restricted = list(BODYTYPE_HUMAN)
icon_supported_species_tags = null
- icon_auto_adapt = FALSE
/obj/item/clothing/suit/space/void/dominia
name = "dominian prejoroub combat suit"
@@ -680,9 +682,9 @@
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
+ species_restricted = list(BODYTYPE_HUMAN)
icon_supported_species_tags = list("una")
- icon_auto_adapt = TRUE
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI)
/obj/item/clothing/suit/space/void/dominia/voidsman
name = "dominian voidsman suit"
@@ -691,7 +693,7 @@
item_state = "voidsman"
species_restricted = list(BODYTYPE_HUMAN)
icon_supported_species_tags = null
- icon_auto_adapt = FALSE
+ refittable_species = list(BODYTYPE_HUMAN)
/obj/item/clothing/head/helmet/space/void/golden_deep
name = "golden helmet"
@@ -742,8 +744,8 @@
desc = "A rugged polymer and alloy space helmet with a ballistic glass and polycarbonate visor commonly used by astronauts from Himeo."
desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
- icon_state = "rig0-himeo"
- item_state = "rig0-himeo"
+ icon_state = "himeo_helm"
+ item_state = "himeo_helm"
item_state_slots = list(
slot_l_hand_str = "mining_helm",
slot_r_hand_str = "mining_helm"
@@ -753,51 +755,50 @@
/obj/item/clothing/suit/space/void/mining/himeo
name = "himeo mining voidsuit"
- item_state_slots = list(
- slot_l_hand_str = "mining_hardsuit",
- slot_r_hand_str = "mining_hardsuit"
- )
desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch."
desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
- item_state = "rig-himeo"
- icon_state = "rig-himeo"
+ item_state = "himeo"
+ icon_state = "himeo"
+ item_state_slots = list(
+ slot_l_hand_str = "mining",
+ slot_r_hand_str = "mining"
+ )
/obj/item/clothing/head/helmet/space/void/engineering/himeo
name = "himeo engineering voidsuit helmet"
desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo."
desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
- icon_state = "rig0-himeo-engineering"
- item_state = "rig0-himeo-engineering"
+ item_state = "himeo_helm"
+ icon_state = "himeo_helm"
+ light_overlay = "helmet_light_dual"
item_state_slots = list(
slot_l_hand_str = "engineering_helm",
slot_r_hand_str = "engineering_helm"
)
- light_overlay = "helmet_light_dual"
-
/obj/item/clothing/suit/space/void/engineering/himeo
name = "himeo engineering voidsuit"
- item_state_slots = list(
- slot_l_hand_str = "engineering_hardsuit",
- slot_r_hand_str = "engineering_hardsuit"
- )
desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have lead lining in it."
desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
- item_state = "rig-himeo-engineering"
- icon_state = "rig-himeo-engineering"
+ item_state = "himeo"
+ icon_state = "himeo"
+ item_state_slots = list(
+ slot_l_hand_str = "engineering",
+ slot_r_hand_str = "engineering"
+ )
/obj/item/clothing/head/helmet/space/void/atmos/himeo
name = "himeo atmospherics voidsuit helmet"
desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model appears to have a thicker layer of insulation on it."
desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
- icon_state = "rig0-himeo-engineering"
- item_state = "rig0-himeo-engineering"
+ item_state = "himeo_helm"
+ icon_state = "himeo_helm"
item_state_slots = list(
slot_l_hand_str = "atmos_helm",
slot_r_hand_str = "atmos_helm"
@@ -807,16 +808,16 @@
/obj/item/clothing/suit/space/void/atmos/himeo
name = "himeo atmospherics voidsuit"
- item_state_slots = list(
- slot_l_hand_str = "atmos_hardsuit",
- slot_r_hand_str = "atmos_hardsuit"
- )
desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have better insulation in it."
desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
- item_state = "rig-himeo-engineering"
- icon_state = "rig-himeo-engineering"
+ item_state = "himeo"
+ icon_state = "himeo"
+ item_state_slots = list(
+ slot_l_hand_str = "atmos",
+ slot_r_hand_str = "atmos"
+ )
/obj/item/clothing/head/helmet/space/void/mining/himeo/tajara
name = "himeo mining voidsuit helmet"
@@ -924,7 +925,6 @@
desc = "An uparmored variant of the gargoyle voidsuit helmet, with a solid visor and redundant comms antenna. Intended for urban combat operations."
icon_state = "srf_helmet"
item_state = "srf_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/srf
name = "solarian restoration front voidsuit"
@@ -932,14 +932,12 @@
both on account of its intimidating design and in an effort to distinguish its forces from others using the Type-4, warlord or not. This one has the SRF's flag on the breastplate."
icon_state = "srf_suit"
item_state = "srf_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/league
name = "anti-corporate league voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the League of Independent Corporate-Free Systems to match the colors of the Xanusian \"Vulture\" voidsuit, and also features a modified comms antenna."
icon_state = "league_helmet"
item_state = "league_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/league
name = "anti-corporate league voidsuit"
@@ -947,14 +945,12 @@
\"Vulture\" voidsuit, to make it more easily identified by friendly Coalition forces."
icon_state = "league_suit"
item_state = "league_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/fsf
name = "free solarian fleets voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Free Solarian Fleets to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon_state = "fsf_helmet"
item_state = "fsf_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/fsf
name = "free solarian fleets voidsuit"
@@ -962,29 +958,24 @@
from other forces using the Type-4, warlord or not."
icon_state = "fsf_suit"
item_state = "fsf_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/ssmd
name = "military district voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Solarian Military District to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon_state = "ssmd_helmet"
item_state = "ssmd_helmet"
- contained_sprite = TRUE
-
/obj/item/clothing/suit/space/void/sol/ssmd
name = "military district voidsuit"
desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Southern Solarian Military District to make it more easily identifiable \
from other forces using the Type-4, warlord or not."
icon_state = "ssmd_suit"
item_state = "ssmd_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/spg
name = "provisional government voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Solarian Provisional Government to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon_state = "spg_helmet"
item_state = "spg_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/spg
name = "provisional government voidsuit"
@@ -992,14 +983,12 @@
from other forces using the Type-4, warlord or not."
icon_state = "spg_suit"
item_state = "spg_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/mrsp
name = "shield pact voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Middle Ring Shield Pact to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon_state = "mrsp_helmet"
item_state = "mrsp_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/mrsp
name = "shield pact voidsuit"
@@ -1007,14 +996,12 @@
from other forces using the Type-4, warlord or not."
icon_state = "mrsp_suit"
item_state = "mrsp_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/sol/sfa
name = "southern fleet administration voidsuit helmet"
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Fleet Administration to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon_state = "sfa_helmet"
item_state = "sfa_helmet"
- contained_sprite = TRUE
/obj/item/clothing/suit/space/void/sol/sfa
name = "southern fleet administration voidsuit"
@@ -1022,7 +1009,6 @@
from other forces using the Type-4, warlord or not. Due to poor maintenance, the highlights appear to have gone out."
icon_state = "sfa_suit"
item_state = "sfa_suit"
- contained_sprite = TRUE
/obj/item/clothing/head/helmet/space/void/coalition/gadpathur
name = "coalition vulture-GP voidsuit helmet"
@@ -1048,7 +1034,7 @@
item_state = "konyang_helmet"
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
icon_supported_species_tags = "ipc"
-
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
/obj/item/clothing/suit/space/void/sol/konyang
name = "konyang aerospace forces voidsuit"
@@ -1057,9 +1043,8 @@
icon_state = "konyang_suit"
item_state = "konyang_suit"
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
- icon_auto_adapt = TRUE
icon_supported_species_tags = "ipc"
-
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC)
/obj/item/clothing/suit/space/void/tcaf
name = "tau ceti armed forces voidsuit"
@@ -1079,11 +1064,10 @@
slowdown = 1
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_SKRELL)
contained_sprite = TRUE
icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw")
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
/obj/item/clothing/head/helmet/space/void/tcaf
name = "tau ceti armed forces voidsuit helmet"
@@ -1100,10 +1084,9 @@
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
- species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
- icon_auto_adapt = TRUE
- icon_species_in_hand = TRUE
+ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU)
contained_sprite = TRUE
icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw")
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
brightness_on = 6
siemens_coefficient = 0.35
diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm
index 011bf9280d4..6025168f579 100644
--- a/code/modules/clothing/spacesuits/void/station.dm
+++ b/code/modules/clothing/spacesuits/void/station.dm
@@ -3,11 +3,15 @@
/obj/item/clothing/head/helmet/space/void/engineering
name = "engineering voidsuit helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
- icon_state = "rig0-engineering"
- item_state_slots = list(
- slot_l_hand_str = "eng_helm",
- slot_r_hand_str = "eng_helm"
+ icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
+ icon_state = "engineering_helm"
+ item_state = "engineering_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "engineering_helm",
+ slot_l_hand_str = "engineering_helm"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -23,13 +27,16 @@
/obj/item/clothing/suit/space/void/engineering
name = "engineering voidsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
- icon_state = "rig-engineering"
- item_state = "rig-engineering"
- slowdown = 1
- item_state_slots = list(
- slot_l_hand_str = "eng_hardsuit",
- slot_r_hand_str = "eng_hardsuit"
+ icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
+ icon_state = "engineering"
+ item_state = "engineering"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "engineering",
+ slot_l_hand_str = "engineering"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
+ slowdown = 1
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -45,11 +52,15 @@
/obj/item/clothing/head/helmet/space/void/mining
name = "mining voidsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
- icon_state = "rig0-mining"
- item_state_slots = list(
- slot_l_hand_str = "mining_helm",
- slot_r_hand_str = "mining_helm"
+ icon = 'icons/obj/clothing/voidsuit/station/mining.dmi'
+ icon_state = "mining_helm"
+ item_state = "mining_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "mining_helm",
+ slot_l_hand_str = "mining_helm"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -63,13 +74,16 @@
/obj/item/clothing/suit/space/void/mining
name = "mining voidsuit"
- item_state_slots = list(
- slot_l_hand_str = "mining_hardsuit",
- slot_r_hand_str = "mining_hardsuit"
- )
desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
- item_state = "rig-mining"
- icon_state = "rig-mining"
+ icon = 'icons/obj/clothing/voidsuit/station/mining.dmi'
+ icon_state = "mining"
+ item_state = "mining"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "mining",
+ slot_l_hand_str = "mining"
+ )
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -79,16 +93,21 @@
rad = ARMOR_RAD_MINOR
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka, /obj/item/gun/energy/vaurca/thermaldrill,/obj/item/rfd/mining)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
//Medical Rig
/obj/item/clothing/head/helmet/space/void/medical
name = "medical voidsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has minor radiation shielding."
- icon_state = "rig0-medical"
- item_state_slots = list(
- slot_l_hand_str = "medical_helm",
- slot_r_hand_str = "medical_helm"
+ icon = 'icons/obj/clothing/voidsuit/station/medical.dmi'
+ icon_state = "medical_helm"
+ item_state = "medical_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "medical_helm",
+ slot_l_hand_str = "medical_helm"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_KNIVES,
laser = ARMOR_LASER_MINOR,
@@ -98,16 +117,20 @@
)
light_overlay = "helmet_light_dual_low"
brightness_on = 6
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/medical
name = "medical voidsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
- icon_state = "rig-medical"
- item_state = "rig-medical"
- item_state_slots = list(
- slot_l_hand_str = "medical_hardsuit",
- slot_r_hand_str = "medical_hardsuit"
+ icon = 'icons/obj/clothing/voidsuit/station/medical.dmi'
+ icon_state = "medical"
+ item_state = "medical"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "medical",
+ slot_l_hand_str = "medical"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_KNIVES,
laser = ARMOR_LASER_MINOR,
@@ -116,16 +139,21 @@
rad = ARMOR_RAD_SMALL
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/device/breath_analyzer,/obj/item/material/twohanded/fireaxe)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
//Security
/obj/item/clothing/head/helmet/space/void/security
name = "security voidsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
- icon_state = "rig0-sec"
- item_state_slots = list(
- slot_l_hand_str = "sec_helm",
- slot_r_hand_str = "sec_helm"
+ icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
+ icon_state = "security_helm"
+ item_state = "security_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "security_helm",
+ slot_l_hand_str = "security_helm"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -136,16 +164,20 @@
)
light_overlay = "helmet_light_dual_low"
brightness_on = 6
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/security
name = "security voidsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
- icon_state = "rig-sec"
- item_state = "rig-sec"
- item_state_slots = list(
- slot_l_hand_str = "sec_hardsuit",
- slot_r_hand_str = "sec_hardsuit"
+ icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
+ icon_state = "security"
+ item_state = "security"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "security",
+ slot_l_hand_str = "security"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -155,16 +187,21 @@
rad = ARMOR_RAD_MINOR
)
allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
//Atmospherics Rig
/obj/item/clothing/head/helmet/space/void/atmos
desc = "A special helmet designed for work in a hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
name = "atmospherics voidsuit helmet"
- icon_state = "rig0-atmos"
- item_state_slots = list(
- slot_l_hand_str = "atmos_helm",
- slot_r_hand_str = "atmos_helm"
+ icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
+ icon_state = "atmos_helm"
+ item_state = "atmos_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "atmos_helm",
+ slot_l_hand_str = "atmos_helm"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -177,16 +214,20 @@
max_pressure_protection = FIRESUIT_MAX_PRESSURE
light_overlay = "helmet_light_dual_low"
brightness_on = 6
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
/obj/item/clothing/suit/space/void/atmos
name = "atmos voidsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
- item_state = "rig-atmos"
- icon_state = "rig-atmos"
- item_state_slots = list(
- slot_l_hand_str = "atmos_hardsuit",
- slot_r_hand_str = "atmos_hardsuit"
+ icon = 'icons/obj/clothing/voidsuit/station/engineering.dmi'
+ icon_state = "atmos"
+ item_state = "atmos"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "atmos",
+ slot_l_hand_str = "atmos"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
@@ -198,16 +239,21 @@
max_pressure_protection = FIRESUIT_MAX_PRESSURE
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 // It is a suit designed for fire, enclosed
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
//Head of Security
/obj/item/clothing/head/helmet/space/void/hos
name = "heavy security voidsuit helmet"
desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor, and gold trim."
- icon_state = "rig0-hos"
- item_state_slots = list(
- slot_l_hand_str = "sec_helm",
- slot_r_hand_str = "sec_helm"
- )
+ icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
+ icon_state = "hos_helm"
+ item_state = "hos_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "security_helm",
+ slot_l_hand_str = "security_helm"
+ )
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -217,16 +263,20 @@
rad = ARMOR_RAD_RESISTANT
)
light_overlay = "helmet_light_dual"
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/hos
name = "heavy security voidsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor, and gold trim."
- item_state = "rig-hos"
- icon_state = "rig-hos"
- item_state_slots = list(
- slot_l_hand_str = "sec_hardsuit",
- slot_r_hand_str = "sec_hardsuit"
+ icon = 'icons/obj/clothing/voidsuit/station/security.dmi'
+ icon_state = "hos"
+ item_state = "hos"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "security",
+ slot_l_hand_str = "security"
)
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
@@ -236,13 +286,21 @@
rad = ARMOR_RAD_RESISTANT
)
allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL)
//Science
/obj/item/clothing/head/helmet/space/void/sci
name = "research voidsuit helmet"
desc = "A special helmet designed for usage by SCC research personnel in hazardous, low pressure environments."
- icon_state = "rig0-sci"
- item_state = "research_voidsuit_helmet"
+ icon = 'icons/obj/clothing/voidsuit/station/research.dmi'
+ icon_state = "research_helm"
+ item_state = "research_helm"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "research_helm",
+ slot_l_hand_str = "research_helm"
+ )
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
armor = list(
melee = ARMOR_MELEE_KNIVES,
laser = ARMOR_LASER_MINOR,
@@ -250,12 +308,20 @@
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_RESISTANT
)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
/obj/item/clothing/suit/space/void/sci
name = "research voidsuit"
desc = "A special suit that designed for usage by SCC research personnel in hazardous, low pressure environments."
- item_state = "rig-sci"
- icon_state = "rig-sci"
+ icon = 'icons/obj/clothing/voidsuit/station/research.dmi'
+ icon_state = "research"
+ item_state = "research"
+ item_state_slots = list( //so that it isn't overridden on refit
+ slot_r_hand_str = "research",
+ slot_l_hand_str = "research"
+ )
+ contained_sprite = TRUE
+ icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau")
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit)
armor = list(
melee = ARMOR_MELEE_KNIVES,
@@ -264,3 +330,4 @@
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_RESISTANT
)
+ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA)
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index aeac4536ec2..620a7949763 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -27,14 +27,12 @@
BODYTYPE_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
BODYTYPE_TAJARA = 'icons/mob/species/tajaran/helmet.dmi',
BODYTYPE_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
- BODYTYPE_VAURCA = 'icons/mob/species/vaurca/helmet.dmi',
BODYTYPE_IPC = 'icons/mob/species/machine/helmet.dmi'
)
sprite_sheets_obj = list(
BODYTYPE_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi',
BODYTYPE_TAJARA = 'icons/obj/clothing/species/tajaran/hats.dmi',
BODYTYPE_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi',
- BODYTYPE_VAURCA = 'icons/obj/clothing/species/vaurca/hats.dmi',
BODYTYPE_IPC = 'icons/obj/clothing/species/machine/hats.dmi'
)
@@ -67,14 +65,12 @@
BODYTYPE_UNATHI = 'icons/mob/species/unathi/suit.dmi',
BODYTYPE_TAJARA = 'icons/mob/species/tajaran/suit.dmi',
BODYTYPE_SKRELL = 'icons/mob/species/skrell/suit.dmi',
- BODYTYPE_VAURCA = 'icons/mob/species/vaurca/suit.dmi',
BODYTYPE_IPC = 'icons/mob/species/machine/suit.dmi'
)
sprite_sheets_obj = list(
BODYTYPE_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi',
BODYTYPE_TAJARA = 'icons/obj/clothing/species/tajaran/suits.dmi',
BODYTYPE_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi',
- BODYTYPE_VAURCA = 'icons/obj/clothing/species/vaurca/suits.dmi',
BODYTYPE_IPC= 'icons/obj/clothing/species/machine/suits.dmi'
)
diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
index f6b35cee3cd..0b46b2a9f36 100644
--- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
@@ -1,6 +1,5 @@
/datum/species/bug/type_b
name = SPECIES_VAURCA_WARRIOR
- short_name = "vaw"
name_plural = "Type BA"
language = LANGUAGE_VAURCA
species_height = HEIGHT_CLASS_TALL
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 96fa1cdca8e..2aab84af033 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1184,7 +1184,10 @@ There are several things that need to be remembered:
else
mob_icon = l_hand.icon
l_hand.auto_adapt_species(src)
- mob_state = "[UNDERSCORE_OR_NULL(l_hand.icon_species_in_hand ? l_hand.icon_species_tag : null)][l_hand.item_state][WORN_LHAND]"
+ if(l_hand.item_state_slots && l_hand.item_state_slots[slot_l_hand_str])
+ mob_state = "[l_hand.item_state_slots[slot_l_hand_str]][WORN_LHAND]"
+ else
+ mob_state = "[UNDERSCORE_OR_NULL(l_hand.icon_species_in_hand ? l_hand.icon_species_tag : null)][l_hand.item_state][WORN_LHAND]"
else
if(l_hand.item_state_slots && l_hand.item_state_slots[slot_l_hand_str])
mob_state = l_hand.item_state_slots[slot_l_hand_str]
@@ -1220,7 +1223,10 @@ There are several things that need to be remembered:
else
mob_icon = r_hand.icon
r_hand.auto_adapt_species(src)
- mob_state = "[UNDERSCORE_OR_NULL(r_hand.icon_species_in_hand ? r_hand.icon_species_tag : null)][r_hand.item_state][WORN_RHAND]"
+ if(r_hand.item_state_slots && r_hand.item_state_slots[slot_r_hand_str])
+ mob_state = "[r_hand.item_state_slots[slot_r_hand_str]][WORN_RHAND]"
+ else
+ mob_state = "[UNDERSCORE_OR_NULL(r_hand.icon_species_in_hand ? r_hand.icon_species_tag : null)][r_hand.item_state][WORN_RHAND]"
else
if(r_hand.item_state_slots && r_hand.item_state_slots[slot_r_hand_str])
mob_state = r_hand.item_state_slots[slot_r_hand_str]
diff --git a/html/changelogs/RustingWithYou - contained.yml b/html/changelogs/RustingWithYou - contained.yml
new file mode 100644
index 00000000000..7ee7c163455
--- /dev/null
+++ b/html/changelogs/RustingWithYou - contained.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "All station voidsuits are now contained sprites."
+ - tweak: "Suit cyclers now support contained sprites."
diff --git a/html/changelogs/RustingWithYou - offshipfixingbonanza.yml b/html/changelogs/RustingWithYou - offshipfixingbonanza.yml
new file mode 100644
index 00000000000..d12d4cf20fe
--- /dev/null
+++ b/html/changelogs/RustingWithYou - offshipfixingbonanza.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixes several reported issues with away ships."
+ - maptweak: "Adds distress beacons to all ships that were missing them."
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index d4ff616486a..e0851dd4d45 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items/clothing/lefthand_suit.dmi b/icons/mob/items/clothing/lefthand_suit.dmi
index 6046c9f6a83..50261aee5fc 100644
Binary files a/icons/mob/items/clothing/lefthand_suit.dmi and b/icons/mob/items/clothing/lefthand_suit.dmi differ
diff --git a/icons/mob/items/clothing/righthand_suit.dmi b/icons/mob/items/clothing/righthand_suit.dmi
index 744e20b5fc5..ed12dd0ad95 100644
Binary files a/icons/mob/items/clothing/righthand_suit.dmi and b/icons/mob/items/clothing/righthand_suit.dmi differ
diff --git a/icons/mob/species/machine/helmet.dmi b/icons/mob/species/machine/helmet.dmi
index 466e2c0edb6..774a37c1e56 100644
Binary files a/icons/mob/species/machine/helmet.dmi and b/icons/mob/species/machine/helmet.dmi differ
diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi
index b12e2099313..00cff021cc3 100644
Binary files a/icons/mob/species/machine/suit.dmi and b/icons/mob/species/machine/suit.dmi differ
diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi
index 8c401db0925..0bf446e38d5 100644
Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ
diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi
index c5ab30fe5eb..07a3e70bfd5 100644
Binary files a/icons/mob/species/skrell/suit.dmi and b/icons/mob/species/skrell/suit.dmi differ
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi
index d776fc8ba12..f5ea1081364 100644
Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi
index b6aba070872..c838854ecb6 100644
Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi
index 1a81aa05525..bbfd3aec5e9 100644
Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi
index c5d144fb979..fa1ce88bd46 100644
Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ
diff --git a/icons/mob/species/vaurca/helmet.dmi b/icons/mob/species/vaurca/helmet.dmi
index 8afca9ea073..cf74d73796c 100644
Binary files a/icons/mob/species/vaurca/helmet.dmi and b/icons/mob/species/vaurca/helmet.dmi differ
diff --git a/icons/mob/species/vaurca/suit.dmi b/icons/mob/species/vaurca/suit.dmi
index 0bea9a894e9..cf74d73796c 100644
Binary files a/icons/mob/species/vaurca/suit.dmi and b/icons/mob/species/vaurca/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 3ca1abce807..e7f6f78ce81 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 8c94e8a7e85..0aac6cb8709 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/species/machine/hats.dmi b/icons/obj/clothing/species/machine/hats.dmi
index 71c5c359120..be7054526e8 100644
Binary files a/icons/obj/clothing/species/machine/hats.dmi and b/icons/obj/clothing/species/machine/hats.dmi differ
diff --git a/icons/obj/clothing/species/machine/suits.dmi b/icons/obj/clothing/species/machine/suits.dmi
index 6663957110d..29c28854c3e 100644
Binary files a/icons/obj/clothing/species/machine/suits.dmi and b/icons/obj/clothing/species/machine/suits.dmi differ
diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi
index 80742706b31..f8f964e9921 100644
Binary files a/icons/obj/clothing/species/skrell/hats.dmi and b/icons/obj/clothing/species/skrell/hats.dmi differ
diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi
index 4d782e7b294..9f42cc34004 100644
Binary files a/icons/obj/clothing/species/skrell/suits.dmi and b/icons/obj/clothing/species/skrell/suits.dmi differ
diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi
index 6f443f84bae..5ecf27d9f69 100644
Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ
diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi
index ab3a1184f8b..139eb4cd75a 100644
Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ
diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi
index b93b3768ecf..12132c5bc22 100644
Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ
diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi
index e29e38d8f92..b9f8d2a916c 100644
Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ
diff --git a/icons/obj/clothing/species/vaurca/hats.dmi b/icons/obj/clothing/species/vaurca/hats.dmi
deleted file mode 100644
index d9cabb83191..00000000000
Binary files a/icons/obj/clothing/species/vaurca/hats.dmi and /dev/null differ
diff --git a/icons/obj/clothing/species/vaurca/suits.dmi b/icons/obj/clothing/species/vaurca/suits.dmi
deleted file mode 100644
index 2f09901b595..00000000000
Binary files a/icons/obj/clothing/species/vaurca/suits.dmi and /dev/null differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 683605d9148..8d8ec312f87 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/voidsuit/coalition.dmi b/icons/obj/clothing/voidsuit/coalition.dmi
index 1c10414fb49..0826e367fe7 100644
Binary files a/icons/obj/clothing/voidsuit/coalition.dmi and b/icons/obj/clothing/voidsuit/coalition.dmi differ
diff --git a/icons/obj/clothing/voidsuit/elyra.dmi b/icons/obj/clothing/voidsuit/elyra.dmi
index 2f7aa4e1f98..1772beec462 100644
Binary files a/icons/obj/clothing/voidsuit/elyra.dmi and b/icons/obj/clothing/voidsuit/elyra.dmi differ
diff --git a/icons/obj/clothing/voidsuit/galatea.dmi b/icons/obj/clothing/voidsuit/galatea.dmi
deleted file mode 100644
index 5dc4753091e..00000000000
Binary files a/icons/obj/clothing/voidsuit/galatea.dmi and /dev/null differ
diff --git a/icons/obj/clothing/voidsuit/hegemony.dmi b/icons/obj/clothing/voidsuit/hegemony.dmi
index c2b1c314bd4..fae517ae93f 100644
Binary files a/icons/obj/clothing/voidsuit/hegemony.dmi and b/icons/obj/clothing/voidsuit/hegemony.dmi differ
diff --git a/icons/obj/clothing/voidsuit/himeo.dmi b/icons/obj/clothing/voidsuit/himeo.dmi
deleted file mode 100644
index 3a19444bbf9..00000000000
Binary files a/icons/obj/clothing/voidsuit/himeo.dmi and /dev/null differ
diff --git a/icons/obj/clothing/voidsuit/megacorp.dmi b/icons/obj/clothing/voidsuit/megacorp.dmi
index ae7526a5ad6..f35d37429f4 100644
Binary files a/icons/obj/clothing/voidsuit/megacorp.dmi and b/icons/obj/clothing/voidsuit/megacorp.dmi differ
diff --git a/icons/obj/clothing/voidsuit/mercenary.dmi b/icons/obj/clothing/voidsuit/mercenary.dmi
new file mode 100644
index 00000000000..bd378313963
Binary files /dev/null and b/icons/obj/clothing/voidsuit/mercenary.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/captain.dmi b/icons/obj/clothing/voidsuit/station/captain.dmi
new file mode 100644
index 00000000000..f36667e368a
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/captain.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/engineering.dmi b/icons/obj/clothing/voidsuit/station/engineering.dmi
new file mode 100644
index 00000000000..56137c08261
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/engineering.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/medical.dmi b/icons/obj/clothing/voidsuit/station/medical.dmi
new file mode 100644
index 00000000000..a78e6c05e2d
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/medical.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/mining.dmi b/icons/obj/clothing/voidsuit/station/mining.dmi
new file mode 100644
index 00000000000..eb1370635ac
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/mining.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/research.dmi b/icons/obj/clothing/voidsuit/station/research.dmi
new file mode 100644
index 00000000000..7d16abf5f7d
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/research.dmi differ
diff --git a/icons/obj/clothing/voidsuit/station/security.dmi b/icons/obj/clothing/voidsuit/station/security.dmi
new file mode 100644
index 00000000000..f121abb8c9f
Binary files /dev/null and b/icons/obj/clothing/voidsuit/station/security.dmi differ
diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
index 89e775cead3..ecc2ace78b0 100644
--- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
+++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
@@ -346,21 +346,6 @@
temperature = 278.15
},
/area/peoples_station/mess_hall)
-"bG" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"bK" = (
/obj/structure/ship_weapon_dummy,
/obj/effect/floor_decal/industrial/warning{
@@ -630,14 +615,6 @@
temperature = 278.15
},
/area/peoples_station/commissar_quarters)
-"dc" = (
-/obj/effect/floor_decal/corner/black{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/visitor)
"df" = (
/obj/effect/floor_decal/corner_wide/black{
dir = 6
@@ -1866,23 +1843,6 @@
temperature = 278.15
},
/area/peoples_station/hangar)
-"is" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
-"iv" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/red{
- dir = 10
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/mess_hall)
"iw" = (
/turf/simulated/floor/plating{
temperature = 278.15
@@ -3510,14 +3470,6 @@
temperature = 278.15
},
/area/peoples_station/training)
-"pB" = (
-/obj/effect/floor_decal/corner/red{
- dir = 9
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/mess_hall)
"pF" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -3757,14 +3709,6 @@
temperature = 278.15
},
/area/peoples_station/barracks)
-"qL" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/hangar)
"qS" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -5366,17 +5310,6 @@
temperature = 278.15
},
/area/peoples_station/bridge)
-"yw" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/hangar)
"yx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -5645,14 +5578,6 @@
temperature = 278.15
},
/area/shuttle/fang/bridge)
-"zA" = (
-/obj/effect/floor_decal/corner/red{
- dir = 9
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"zB" = (
/obj/effect/floor_decal/corner/red{
dir = 9
@@ -6002,21 +5927,6 @@
temperature = 278.15
},
/area/peoples_station/bridge)
-"Bt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"Bu" = (
/obj/structure/table/wood,
/obj/item/material/ashtray/bronze,
@@ -6426,17 +6336,6 @@
temperature = 278.15
},
/area/shuttle/fang/engine)
-"Dq" = (
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"Dr" = (
/obj/structure/table/stone/marble,
/obj/machinery/light,
@@ -6758,14 +6657,6 @@
temperature = 278.15
},
/area/peoples_station/bridge)
-"EN" = (
-/obj/effect/floor_decal/corner/red{
- dir = 10
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/mess_hall)
"EU" = (
/obj/effect/landmark/entry_point/port{
name = "port, barracks"
@@ -6874,28 +6765,11 @@
},
/area/peoples_station)
"Fz" = (
-/obj/structure/table/rack,
-/obj/machinery/door/window{
- name = "Voidsuit Storage"
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4;
- maxhealth = 140
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
/obj/machinery/light{
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/pra,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -7564,25 +7438,8 @@
/turf/template_noop,
/area/peoples_station/bridge)
"IS" = (
-/obj/structure/table/rack,
-/obj/machinery/door/window{
- name = "Voidsuit Storage"
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4;
- maxhealth = 140
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/pra,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -7776,14 +7633,6 @@
temperature = 278.15
},
/area/peoples_station/robotics_bay)
-"JO" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/hangar)
"JQ" = (
/obj/machinery/light,
/obj/effect/floor_decal/corner/dark_blue{
@@ -8297,14 +8146,6 @@
temperature = 278.15
},
/area/peoples_station)
-"MJ" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/visitor)
"MM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8703,14 +8544,6 @@
temperature = 278.15
},
/area/peoples_station/atmos)
-"OI" = (
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"OJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating{
@@ -9378,12 +9211,6 @@
temperature = 278.15
},
/area/peoples_station/hangar)
-"Ry" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/armory)
"RB" = (
/obj/machinery/light{
dir = 8
@@ -9655,11 +9482,6 @@
temperature = 278.15
},
/area/peoples_station/armory)
-"SO" = (
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station/defenses)
"SQ" = (
/obj/structure/cable/green{
d1 = 2;
@@ -10260,25 +10082,6 @@
temperature = 278.15
},
/area/peoples_station/barracks)
-"Vg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/corner/red{
- dir = 9
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"Vl" = (
/obj/effect/floor_decal/corner/red{
dir = 1
@@ -10645,17 +10448,6 @@
/obj/item/device/flashlight/lamp,
/turf/simulated/floor/carpet/art,
/area/peoples_station/commissar_quarters)
-"Xr" = (
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/peoples_station)
"Xs" = (
/obj/structure/closet/crate/freezer,
/obj/item/storage/field_ration,
@@ -38899,9 +38691,9 @@ mN
Uy
uw
gJ
-SO
+Wl
bq
-SO
+Wl
Uy
Kn
Kn
@@ -39155,9 +38947,9 @@ mN
mN
Uy
fq
-SO
-SO
-SO
+Wl
+Wl
+Wl
Ff
Uy
Kn
@@ -40699,7 +40491,7 @@ Uy
ZP
oW
Aj
-SO
+Wl
Uy
Kn
Kn
@@ -41467,7 +41259,7 @@ lJ
lJ
yj
PH
-Bt
+eZ
zY
rO
rO
@@ -41726,8 +41518,8 @@ hs
xM
JK
No
-OI
-OI
+QK
+QK
Nv
mV
Qc
@@ -41985,7 +41777,7 @@ dt
dt
dt
dt
-is
+qh
GT
hw
CR
@@ -42242,7 +42034,7 @@ Zc
cJ
Dz
dt
-is
+qh
GT
hw
CR
@@ -42499,7 +42291,7 @@ xp
hv
rN
dt
-Xr
+Rq
GT
hw
Xj
@@ -42708,8 +42500,8 @@ hh
Mz
OL
VV
-Ry
-Ry
+LV
+LV
JS
JQ
Mz
@@ -42756,7 +42548,7 @@ zs
Ss
jN
dt
-is
+qh
GT
hw
CR
@@ -43013,7 +42805,7 @@ zs
YD
kd
dt
-is
+qh
GT
Fs
CR
@@ -43270,7 +43062,7 @@ Cf
zh
JN
GH
-bG
+Yy
kC
hw
CR
@@ -43482,7 +43274,7 @@ qo
qo
qo
qo
-Vg
+EH
zB
qo
tx
@@ -43499,7 +43291,7 @@ qo
qo
qo
qo
-Vg
+EH
lH
CR
TC
@@ -43527,7 +43319,7 @@ zs
tk
ZL
dt
-is
+qh
GT
hw
CR
@@ -43784,7 +43576,7 @@ zs
tk
zj
dt
-is
+qh
GT
hw
CR
@@ -43998,8 +43790,8 @@ TV
QK
QK
QK
-OI
-Dq
+QK
+No
QK
QK
QK
@@ -44010,7 +43802,7 @@ QK
QK
QK
QK
-Dq
+No
QK
xS
QK
@@ -44041,7 +43833,7 @@ rE
tk
Ol
dt
-Xr
+Rq
GT
hw
CR
@@ -44298,7 +44090,7 @@ nW
yJ
RO
dt
-is
+qh
dD
UX
CR
@@ -44555,7 +44347,7 @@ dt
dt
dt
dt
-is
+qh
GT
hw
CR
@@ -44788,7 +44580,7 @@ Ms
to
CR
Je
-zA
+qo
eY
zv
zv
@@ -44812,7 +44604,7 @@ zv
yb
lH
CR
-is
+qh
GT
hw
CR
@@ -45303,27 +45095,27 @@ to
CR
JK
No
-OI
-OI
-OI
-OI
QK
-OI
+QK
+QK
+QK
+QK
+QK
sR
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
-OI
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
+QK
Up
CR
Ey
@@ -47125,7 +46917,7 @@ jZ
jZ
fb
qC
-MJ
+Ay
FS
tK
dP
@@ -47637,7 +47429,7 @@ vx
vx
vx
jZ
-EN
+SJ
Gk
Ns
FS
@@ -48153,7 +47945,7 @@ aM
jZ
SJ
qC
-dc
+nk
FS
tK
MC
@@ -48389,8 +48181,8 @@ Kn
Kn
qC
nZ
-pB
-pB
+qD
+qD
Vl
jZ
LA
@@ -48408,9 +48200,9 @@ jZ
jZ
jZ
jZ
-EN
+SJ
Gk
-dc
+nk
FS
tK
tK
@@ -48665,7 +48457,7 @@ aM
aM
aM
jZ
-EN
+SJ
qC
Tl
FS
@@ -48922,7 +48714,7 @@ vx
vx
vx
jZ
-EN
+SJ
qC
nk
FS
@@ -49179,9 +48971,9 @@ vx
vx
vx
jZ
-iv
+ab
qC
-dc
+nk
FS
tK
tK
@@ -49695,7 +49487,7 @@ sM
qc
bC
qC
-dc
+nk
jM
nj
nj
@@ -49952,7 +49744,7 @@ qC
qC
qC
qC
-dc
+nk
Od
nj
Kn
@@ -51215,21 +51007,21 @@ CR
CR
CR
MG
-zA
-zA
+qo
+qo
yT
-zA
-zA
-zA
-zA
-zA
-zA
-zA
-zA
-zA
-zA
+qo
+qo
+qo
+qo
+qo
+qo
+qo
+qo
+qo
+qo
Jp
-zA
+qo
eX
lH
CR
@@ -51751,7 +51543,7 @@ Kn
Kn
Kn
lI
-qL
+ik
Ne
Vb
Vb
@@ -52008,7 +51800,7 @@ lI
lI
lI
lI
-qL
+ik
dN
kk
kk
@@ -52218,24 +52010,24 @@ JJ
QK
QK
QK
-Dq
+No
QK
QK
QK
QK
-Dq
+No
QK
QK
QK
QK
QK
-Dq
+No
QK
QK
Yh
QK
QK
-Dq
+No
GT
QK
Up
@@ -53807,7 +53599,7 @@ Kn
Kn
Kn
lI
-qL
+ik
PV
aP
dR
@@ -54064,7 +53856,7 @@ Kn
Kn
Kn
lI
-yw
+Lb
PV
aP
dR
@@ -54578,7 +54370,7 @@ Kn
Kn
Kn
lI
-JO
+ik
PV
aP
dR
@@ -54835,7 +54627,7 @@ Kn
Kn
Kn
lI
-qL
+ik
PV
aP
dR
@@ -55092,7 +54884,7 @@ Kn
Kn
Kn
lI
-qL
+ik
PV
aP
dR
@@ -55349,7 +55141,7 @@ Kn
Kn
Kn
lI
-qL
+ik
PV
aP
dR
@@ -55606,7 +55398,7 @@ hz
hz
Kn
lI
-yw
+Lb
PV
aP
dR
@@ -55863,7 +55655,7 @@ eu
SH
Kn
lI
-qL
+ik
PV
aP
dR
@@ -56120,7 +55912,7 @@ eu
SH
Kn
lI
-qL
+ik
PV
aP
dR
@@ -56377,7 +56169,7 @@ eu
SH
Kn
lI
-qL
+ik
PV
aP
dR
@@ -56634,7 +56426,7 @@ eu
SH
Kn
lI
-qL
+ik
PV
aP
dR
@@ -57148,7 +56940,7 @@ eu
SH
Kn
lI
-yw
+Lb
PU
mR
mR
@@ -57405,7 +57197,7 @@ eu
SH
Kn
lI
-yw
+Lb
Ao
kk
kk
@@ -57662,7 +57454,7 @@ eu
SH
Kn
lI
-qL
+ik
BO
AD
pF
@@ -57919,7 +57711,7 @@ eu
SH
Kn
lI
-qL
+ik
BO
aP
dR
@@ -58176,7 +57968,7 @@ eu
SH
Kn
lI
-qL
+ik
BO
aP
dR
@@ -58433,7 +58225,7 @@ eu
SH
Kn
lI
-qL
+ik
BO
aP
dR
@@ -58690,7 +58482,7 @@ eu
SH
Kn
lI
-qL
+ik
BO
aP
dR
@@ -58947,7 +58739,7 @@ hz
hz
Kn
lI
-yw
+Lb
BO
aP
dR
@@ -59204,7 +58996,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -59461,7 +59253,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -59718,7 +59510,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -59975,7 +59767,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -60232,7 +60024,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -60489,7 +60281,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -60746,7 +60538,7 @@ Kn
Kn
Kn
lI
-qL
+ik
BO
aP
dR
@@ -61003,7 +60795,7 @@ Kn
Kn
Kn
lI
-yw
+Lb
BO
fy
ll
@@ -61260,7 +61052,7 @@ Kn
Kn
Kn
lI
-qL
+ik
uV
Vb
Vb
diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
index 82cddc56304..23ccb1e98ef 100644
--- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
+++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
@@ -736,6 +736,8 @@
/obj/machinery/alarm/south{
req_one_access = list(204)
},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/eva)
"fJ" = (
@@ -1186,20 +1188,23 @@
icon_state = "0-4"
},
/obj/machinery/power/apc/super/south,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/eva)
"jm" = (
-/obj/structure/table/rack,
+/obj/machinery/suit_cycler/offship/biesel,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/device/gps,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/device/suit_cooling_unit,
-/obj/item/clothing/suit/space/void/tcaf,
-/obj/item/clothing/head/helmet/space/void/tcaf,
-/obj/item/device/gps,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/eva)
"jn" = (
@@ -1246,8 +1251,18 @@
/turf/simulated/floor/plating,
/area/tcaf_corvette/hangar)
"jI" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/eva)
"jT" = (
@@ -2315,20 +2330,11 @@
/turf/simulated/floor/plating,
/area/tcaf_corvette)
"tx" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/device/gps,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/device/suit_cooling_unit,
/obj/machinery/light{
dir = 1
},
-/obj/item/clothing/suit/space/void/tcaf,
-/obj/item/clothing/head/helmet/space/void/tcaf,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/biesel,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/eva)
"tz" = (
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index 902bc9ecc91..13318cb156d 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -477,14 +477,8 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"bHV" = (
-/obj/structure/table/rack,
+/obj/machinery/suit_cycler/offship/coc,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/coalition,
-/obj/item/clothing/head/helmet/space/void/coalition,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/device/gps,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"bIQ" = (
@@ -756,10 +750,7 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"diy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
-/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/turf/simulated/floor,
/area/ship/ranger_corvette/engine2)
"dmm" = (
@@ -795,8 +786,9 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"dul" = (
+/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+ dir = 5
},
/turf/simulated/floor,
/area/ship/ranger_corvette/engine2)
@@ -1095,17 +1087,26 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"eFo" = (
-/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/coalition,
-/obj/item/clothing/head/helmet/space/void/coalition,
-/obj/machinery/alarm/north{
- req_one_access = null
- },
-/obj/item/tank/emergency_oxygen/double,
+/obj/structure/table/rack,
/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"eFH" = (
@@ -1818,18 +1819,10 @@
/turf/simulated/floor,
/area/ship/ranger_corvette/atmospherics)
"hvo" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/coalition,
-/obj/item/clothing/head/helmet/space/void/coalition,
/obj/machinery/light{
dir = 8;
icon_state = "tube_empty"
},
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/device/gps,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"hwT" = (
@@ -1866,7 +1859,6 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"hFA" = (
-/obj/structure/dispenser/oxygen,
/obj/machinery/light{
dir = 4;
icon_state = "tube_empty"
@@ -2299,6 +2291,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/structure/dispenser/oxygen,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"jyH" = (
@@ -2468,13 +2461,10 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/crew)
"kku" = (
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube_empty"
- },
-/obj/machinery/suit_cycler,
-/turf/simulated/floor/tiled/dark,
-/area/ship/ranger_corvette/foyer)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/coc,
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/ranger_corvette/voidsuits)
"kkN" = (
/obj/structure/sign/directions/com{
pixel_x = -32;
@@ -2896,6 +2886,8 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/coc,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"mlG" = (
@@ -3570,10 +3562,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engineering)
"oXn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8
- },
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor,
/area/ship/ranger_corvette/engine2)
"oZS" = (
@@ -38982,9 +38971,9 @@ gkw
uhA
qSB
uOy
-bHV
+kku
hvo
-bHV
+eFo
uOy
tEO
wlA
@@ -39496,7 +39485,7 @@ xRX
xRX
xRX
uOy
-eFo
+bHV
xzg
gMK
oEN
@@ -40010,11 +39999,11 @@ xRX
gJZ
gJZ
uOy
-uOy
+bHV
hFA
jyH
uOy
-kku
+vzU
wlA
wUT
wUT
@@ -40266,7 +40255,7 @@ xRX
xRX
xuX
oXn
-diy
+gJZ
gJZ
gJZ
uOy
@@ -40522,7 +40511,7 @@ xRX
xRX
xRX
scs
-bex
+diy
dul
gJZ
ibp
diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
index f47c5245fcc..8b92c94a370 100644
--- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
+++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
@@ -992,7 +992,13 @@
/turf/simulated/floor,
/area/ship/gadpathur_patrol/galley)
"iB" = (
-/obj/machinery/suit_cycler,
+/obj/effect/floor_decal/industrial/outline/engineering,
+/obj/structure/table/rack,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark,
/area/ship/gadpathur_patrol/eva)
"iG" = (
@@ -2241,28 +2247,6 @@
},
/turf/simulated/floor,
/area/ship/gadpathur_patrol/cic)
-"rJ" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/northleft,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/coalition/gadpathur{
- starting_accessories = list("/obj/item/clothing/accessory/flagpatch/gadpathur")
- },
-/obj/item/clothing/head/helmet/space/void/coalition/gadpathur,
-/obj/structure/sign/vacuum{
- pixel_y = -32
- },
-/obj/item/clothing/mask/breath/gadpathur,
-/turf/simulated/floor/tiled/dark,
-/area/ship/gadpathur_patrol/eva)
"rL" = (
/obj/effect/landmark/entry_point/starboard{
name = "starboard, engine compartment"
@@ -5475,22 +5459,8 @@
/turf/simulated/wall/shuttle/dark/cardinal/gadpathur,
/area/ship/gadpathur_patrol/thrusters/port)
"QR" = (
-/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/door/window/northleft,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/coalition/gadpathur{
- starting_accessories = list("/obj/item/clothing/accessory/flagpatch/gadpathur")
- },
-/obj/item/clothing/head/helmet/space/void/coalition/gadpathur,
-/obj/item/clothing/mask/breath/gadpathur,
+/obj/machinery/suit_cycler/offship/gadpathur,
/turf/simulated/floor/tiled/dark,
/area/ship/gadpathur_patrol/eva)
"QU" = (
@@ -5620,25 +5590,6 @@
"RR" = (
/turf/simulated/floor/tiled/white,
/area/ship/gadpathur_patrol/medbay)
-"RT" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/northleft,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/coalition/gadpathur{
- starting_accessories = list("/obj/item/clothing/accessory/flagpatch/gadpathur")
- },
-/obj/item/clothing/head/helmet/space/void/coalition/gadpathur,
-/obj/item/clothing/mask/breath/gadpathur,
-/turf/simulated/floor/tiled/dark,
-/area/ship/gadpathur_patrol/eva)
"RU" = (
/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -36916,7 +36867,7 @@ vx
So
PC
So
-rJ
+QR
Nm
Nm
Nm
@@ -37173,7 +37124,7 @@ qe
XE
el
So
-RT
+QR
XX
RP
IR
diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm
index 4678b03b760..d60e52f84f3 100644
--- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm
+++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm
@@ -474,33 +474,8 @@
/turf/simulated/floor/reinforced,
/area/ship/dominian_unathi/engineering)
"dF" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia,
-/obj/item/clothing/head/helmet/space/void/dominia,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/effect/floor_decal/corner/orange{
- dir = 6
- },
-/obj/effect/floor_decal/corner/orange{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window{
- dir = 2;
- name = "Voidsuit Storage";
- req_access = list(212)
- },
+/obj/machinery/suit_cycler/offship/dominia,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_unathi/eva)
"dK" = (
@@ -1435,6 +1410,9 @@
/area/shuttle/dominian_unathi)
"kT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/floor_decal/corner/orange{
+ dir = 5
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_unathi/eva)
"kW" = (
@@ -4755,6 +4733,9 @@
/obj/machinery/power/apc/north{
req_access = null
},
+/obj/effect/floor_decal/corner/orange{
+ dir = 5
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_unathi/eva)
"FW" = (
@@ -7246,33 +7227,11 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_unathi/crew)
"Xh" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia,
-/obj/item/clothing/head/helmet/space/void/dominia,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/effect/floor_decal/corner/orange{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window{
- dir = 2;
- name = "Voidsuit Storage";
- req_access = list(212)
- },
/obj/machinery/light{
dir = 1
},
+/obj/machinery/suit_cycler/offship/dominia,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_unathi/eva)
"Xj" = (
@@ -7550,33 +7509,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_unathi)
-"YF" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/dominia,
-/obj/item/clothing/head/helmet/space/void/dominia,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/effect/floor_decal/corner/orange{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window{
- dir = 2;
- name = "Voidsuit Storage";
- req_access = list(212)
- },
-/turf/simulated/floor/tiled/dark,
-/area/ship/dominian_unathi/eva)
"YH" = (
/obj/machinery/light{
dir = 4
@@ -24562,7 +24494,7 @@ EV
HG
NL
gY
-YF
+dF
nd
zB
gY
@@ -24724,7 +24656,7 @@ EV
tg
Zh
gY
-YF
+dF
nd
lv
gY
diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
index 338ca0344da..39878da395c 100644
--- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
+++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
@@ -225,23 +225,8 @@
},
/area/hailstorm_ship/crew)
"aF" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/dpra,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/head/helmet/space/void/dpra,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/dpra,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -387,6 +372,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled{
temperature = 278.15
},
diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
index a6c82c9ed59..acd8b5062b4 100644
--- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
+++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
@@ -1498,6 +1498,17 @@
/obj/item/melee/energy/sword/knife/elyra{
pixel_x = 6
},
+/obj/item/melee/energy/sword/knife/elyra{
+ pixel_x = -6
+ },
+/obj/item/melee/energy/sword/knife/elyra,
+/obj/item/melee/energy/sword/knife/elyra{
+ pixel_x = 6
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = 24
+ },
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"hv" = (
@@ -2129,13 +2140,6 @@
},
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/starboardthrust)
-"ll" = (
-/obj/structure/railing/mapped{
- dir = 4
- },
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/airless,
-/area/space)
"ln" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/cable{
@@ -4145,13 +4149,13 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/elyran_corvette/cic)
"xn" = (
-/obj/item/hullbeacon/red,
-/obj/structure/railing/mapped{
- dir = 4
+/obj/effect/floor_decal/corner/beige{
+ dir = 10
},
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/airless,
-/area/space)
+/obj/machinery/suit_cycler/offship/elyra,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/elyran_corvette/briefing)
"xr" = (
/obj/structure/cable{
d1 = 1;
@@ -5129,19 +5133,8 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/starboardwep)
"Dn" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/elyra,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/valkyrie,
-/obj/item/clothing/head/helmet/space/void/valkyrie,
-/obj/item/device/gps,
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = 24
- },
+/obj/machinery/suit_cycler/offship/elyra,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"Do" = (
@@ -7255,15 +7248,13 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/elyran_corvette/engineering)
"OV" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/accessory/flagpatch/elyra,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/device/gps,
/obj/machinery/light/colored/decayed,
-/obj/structure/table/steel,
-/obj/item/melee/energy/sword/knife/elyra{
- pixel_x = -6
- },
-/obj/item/melee/energy/sword/knife/elyra,
-/obj/item/melee/energy/sword/knife/elyra{
- pixel_x = 6
- },
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"OY" = (
@@ -7860,15 +7851,6 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/starboardwep)
"RI" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/elyra,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/valkyrie,
-/obj/item/clothing/head/helmet/space/void/valkyrie,
-/obj/item/device/gps,
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"RM" = (
@@ -8233,19 +8215,12 @@
/turf/simulated/floor/reinforced,
/area/ship/elyran_corvette/portwep)
"TJ" = (
-/obj/structure/table/rack,
/obj/effect/floor_decal/corner/beige{
- dir = 10
+ dir = 5
},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/elyra,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/valkyrie,
-/obj/item/clothing/head/helmet/space/void/valkyrie,
-/obj/item/device/gps,
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/suit_cycler/offship/elyra,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"TL" = (
/obj/effect/floor_decal/corner/green{
@@ -8364,18 +8339,8 @@
/turf/simulated/floor/tiled,
/area/ship/elyran_corvette/porthallway)
"Uw" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/corner/beige{
- dir = 5
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/elyra,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/valkyrie,
-/obj/item/clothing/head/helmet/space/void/valkyrie,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/elyra,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/briefing)
"Uy" = (
@@ -46909,7 +46874,7 @@ Dn
GZ
pu
UP
-RI
+Dn
ve
Lu
fr
@@ -47163,9 +47128,9 @@ KK
KK
ve
RI
-TJ
-ft
-Uw
+GZ
+pu
+UP
RI
ve
Iz
@@ -47417,13 +47382,13 @@ HK
HK
HK
HK
-HK
-ve
-ve
-ve
-ZY
-ve
+KK
ve
+Uw
+xn
+ft
+TJ
+Dn
ve
mf
QB
@@ -47675,12 +47640,12 @@ HK
HK
HK
HK
-HK
-HK
-rO
-ll
-ll
-xn
+ve
+ve
+ve
+ZY
+ve
+ve
ve
Nx
En
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
index a1b7eee8530..9b2a146d3f4 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
@@ -697,18 +697,9 @@
/turf/simulated/floor,
/area/hegemony_ship/captains_quarters)
"eO" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light,
-/obj/item/clothing/suit/space/void/hegemony/specialist,
-/obj/item/clothing/head/helmet/space/void/hegemony/specialist,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/machinery/door/window/brigdoor/southright{
- req_access = list(113);
- dir = 1
- },
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/hegemony/specialist,
/turf/simulated/floor,
/area/hegemony_ship/eva_storage)
"eQ" = (
@@ -2450,17 +2441,8 @@
/turf/simulated/floor,
/area/hegemony_ship/starboard_propulsion)
"pH" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/item/clothing/suit/space/void/hegemony/priest,
-/obj/item/clothing/head/helmet/space/void/hegemony/priest,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/machinery/door/window/brigdoor/southright{
- req_access = list(113);
- dir = 1
- },
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/hegemony/priest,
/turf/simulated/floor,
/area/hegemony_ship/eva_storage)
"pI" = (
@@ -2637,22 +2619,8 @@
/turf/simulated/floor/foamedmetal,
/area/hegemony_ship/warpriests_quarters)
"qL" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/item/clothing/suit/space/void/hegemony,
-/obj/item/clothing/head/helmet/space/void/hegemony,
-/obj/item/clothing/head/helmet/space/void/hegemony,
-/obj/item/clothing/suit/space/void/hegemony,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/machinery/door/window/brigdoor/southright{
- req_access = list(113);
- dir = 1
- },
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/hegemony,
/turf/simulated/floor,
/area/hegemony_ship/eva_storage)
"qO" = (
@@ -3425,6 +3393,12 @@
/obj/item/storage/bag/inflatable,
/obj/machinery/firealarm/north,
/obj/item/storage/bag/inflatable,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled,
/area/hegemony_ship/eva_storage)
"vf" = (
@@ -5017,6 +4991,8 @@
/obj/item/clothing/head/welding,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/glasses/welding,
+/obj/item/gun/energy/plasmacutter,
+/obj/item/gun/energy/plasmacutter,
/turf/simulated/floor/tiled,
/area/hegemony_ship/eva_storage)
"Ei" = (
@@ -5607,12 +5583,8 @@
/turf/simulated/floor,
/area/hegemony_ship/trophy_room)
"Hq" = (
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/structure/closet{
- name = "breaching equipment"
- },
-/obj/item/gun/energy/plasmacutter,
-/obj/item/gun/energy/plasmacutter,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/suit_cycler/offship/hegemony,
/turf/simulated/floor/tiled,
/area/hegemony_ship/eva_storage)
"Hz" = (
@@ -7147,28 +7119,11 @@
/turf/simulated/floor/holofloor/desert,
/area/hegemony_ship)
"QF" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light{
dir = 1
},
-/obj/item/clothing/suit/space/void/hegemony/captain,
-/obj/item/clothing/head/helmet/space/void/hegemony/captain,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/machinery/door/window/brigdoor/southright{
- req_access = list(114)
- },
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/hegemony,
/turf/simulated/floor,
/area/hegemony_ship/eva_storage)
"QM" = (
@@ -8404,9 +8359,6 @@
/turf/simulated/floor,
/area/hegemony_ship/gun_deck_flak)
"YG" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
/obj/structure/window/reinforced,
/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
@@ -8416,6 +8368,12 @@
dir = 1
},
/obj/item/device/gps,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/turf/simulated/floor,
/area/hegemony_ship/eva_storage)
"YK" = (
diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm
index a1b8c5688b9..9d1afa0fb78 100644
--- a/maps/away/ships/heph/cyclops/cyclops.dmm
+++ b/maps/away/ships/heph/cyclops/cyclops.dmm
@@ -3024,6 +3024,14 @@
"CE" = (
/turf/template_noop,
/area/space)
+"CH" = (
+/obj/effect/floor_decal/corner/orange{
+ dir = 10
+ },
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/hephaestus,
+/turf/simulated/floor/tiled/dark,
+/area/hephmining_ship/cyclops)
"CT" = (
/obj/effect/floor_decal/corner/orange{
dir = 10
@@ -36122,7 +36130,7 @@ Qd
Ut
zi
qU
-rG
+CH
Qd
Zr
AQ
diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm
index bba48ea15fc..c9a399fa56a 100644
--- a/maps/away/ships/heph/heph_security/heph_security.dmm
+++ b/maps/away/ships/heph/heph_security/heph_security.dmm
@@ -1460,10 +1460,6 @@
"kN" = (
/obj/effect/floor_decal/industrial/hatch/red,
/obj/machinery/light,
-/obj/structure/closet/secure_closet/guncabinet{
- req_access = list(216);
- name = "ammunition"
- },
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/storage/box/shotgunammo,
@@ -1487,6 +1483,24 @@
/obj/item/ammo_magazine/c45m,
/obj/item/ammo_magazine/c45m,
/obj/item/ammo_magazine/c45m,
+/obj/item/gun/projectile/automatic/wt550/lethal,
+/obj/structure/closet/secure_closet/guncabinet{
+ req_access = list(216);
+ name = "ballistics"
+ },
+/obj/item/gun/projectile/automatic/wt550/lethal,
+/obj/item/gun/projectile/sec/lethal,
+/obj/item/gun/projectile/sec/lethal,
+/obj/item/gun/projectile/sec/lethal,
+/obj/item/gun/projectile/sec/lethal,
+/obj/item/gun/projectile/sec/lethal,
+/obj/item/gun/projectile/automatic/rifle/jingya{
+ magazine_type = /obj/item/ammo_magazine/a556/carbine
+ },
+/obj/item/gun/projectile/automatic/rifle/jingya{
+ magazine_type = /obj/item/ammo_magazine/a556/carbine
+ },
+/obj/item/gun/projectile/shotgun/pump/combat,
/turf/simulated/floor/tiled/dark/full,
/area/heph_security_ship/armory)
"kO" = (
@@ -1508,24 +1522,6 @@
},
/turf/simulated/floor/carpet/rubber,
/area/shuttle/heph_security)
-"kY" = (
-/obj/structure/table/rack,
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/item/clothing/suit/armor/carrier/ballistic,
-/obj/item/clothing/suit/armor/carrier/ballistic,
-/obj/item/clothing/head/helmet/ballistic,
-/obj/machinery/door/window/brigdoor{
- req_access = list(216);
- dir = 4
- },
-/obj/item/clothing/glasses/safety/goggles/tactical{
- brand_name = "Hephaestus Industries"
- },
-/obj/item/clothing/glasses/safety/goggles/tactical{
- brand_name = "Hephaestus Industries"
- },
-/turf/simulated/floor,
-/area/heph_security_ship/armory)
"kZ" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -1821,6 +1817,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
+/obj/machinery/suit_cycler/offship/hephaestus,
/turf/simulated/floor/tiled,
/area/heph_security_ship/armory)
"nt" = (
@@ -2352,38 +2349,10 @@
/area/heph_security_ship/brig)
"qG" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/tank/jetpack/carbondioxide,
/obj/machinery/light{
dir = 8
},
-/obj/item/clothing/suit/space/void/hephaestus,
-/obj/item/clothing/suit/space/void/hephaestus,
-/obj/item/clothing/suit/space/void/hephaestus,
-/obj/item/clothing/suit/space/void/hephaestus,
-/obj/item/clothing/suit/space/void/hephaestus,
-/obj/item/clothing/head/helmet/space/void/hephaestus,
-/obj/item/clothing/head/helmet/space/void/hephaestus,
-/obj/item/clothing/head/helmet/space/void/hephaestus,
-/obj/item/clothing/head/helmet/space/void/hephaestus,
-/obj/item/clothing/head/helmet/space/void/hephaestus,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/mask/gas/half,
-/obj/machinery/door/window/brigdoor{
- req_access = list(216);
- dir = 4
- },
+/obj/machinery/suit_cycler/offship/hephaestus,
/turf/simulated/floor,
/area/heph_security_ship/armory)
"qH" = (
@@ -3270,31 +3239,11 @@
/turf/template_noop,
/area/space)
"xN" = (
-/obj/effect/floor_decal/industrial/hatch/red,
-/obj/structure/closet/secure_closet/guncabinet{
- req_access = list(216);
- name = "security equipment"
- },
/obj/machinery/light,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
-/obj/item/device/flash,
-/obj/item/device/flash,
-/obj/item/device/flash,
-/obj/item/device/flash,
-/obj/item/device/flash,
-/obj/item/shield/energy,
-/obj/item/shield/energy,
-/obj/item/shield/energy,
-/obj/item/shield/energy,
-/obj/item/shield/energy,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/handcuffs,
-/turf/simulated/floor/tiled/dark/full,
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/suit_cycler/offship/hephaestus,
+/turf/simulated/floor,
/area/heph_security_ship/armory)
"xO" = (
/obj/structure/bed/stool/chair/office/bridge/pilot,
@@ -3762,6 +3711,16 @@
/obj/item/tank/emergency_oxygen/double,
/obj/item/tank/emergency_oxygen/double,
/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
/turf/simulated/floor,
/area/heph_security_ship/armory)
"CQ" = (
@@ -3841,17 +3800,36 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/heph_security_ship)
"DF" = (
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
+/obj/effect/floor_decal/industrial/hatch/red,
/obj/structure/closet/secure_closet/guncabinet{
- req_access = null
+ req_access = list(216);
+ name = "security equipment"
},
-/obj/item/gun/energy/disruptorpistol,
-/obj/item/gun/energy/disruptorpistol,
-/obj/item/gun/energy/disruptorpistol,
-/obj/item/gun/energy/disruptorpistol,
-/obj/item/gun/energy/disruptorpistol,
/obj/machinery/light,
-/turf/simulated/floor/tiled,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/baton/loaded,
+/obj/item/device/flash,
+/obj/item/device/flash,
+/obj/item/device/flash,
+/obj/item/device/flash,
+/obj/item/device/flash,
+/obj/item/shield/energy,
+/obj/item/shield/energy,
+/obj/item/shield/energy,
+/obj/item/shield/energy,
+/obj/item/shield/energy,
+/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/handcuffs,
+/obj/item/gun/energy/disruptorpistol,
+/obj/item/gun/energy/disruptorpistol,
+/obj/item/gun/energy/disruptorpistol,
+/obj/item/gun/energy/disruptorpistol,
+/obj/item/gun/energy/disruptorpistol,
+/turf/simulated/floor/tiled/dark/full,
/area/heph_security_ship/brig)
"DI" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -4445,10 +4423,6 @@
/turf/simulated/floor/tiled,
/area/heph_security_ship/dock)
"Iz" = (
-/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
/obj/machinery/recharger/wallcharger{
pixel_x = -24
},
@@ -4456,7 +4430,9 @@
pixel_x = -24;
pixel_y = -9
},
-/turf/simulated/floor/tiled,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/suit_cycler/offship/hephaestus,
+/turf/simulated/floor,
/area/heph_security_ship/armory)
"IA" = (
/obj/machinery/iff_beacon/name_change,
@@ -5082,26 +5058,8 @@
/turf/simulated/floor/tiled/dark,
/area/heph_security_ship/francisca)
"Nh" = (
-/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/item/clothing/suit/armor/carrier/ablative,
-/obj/item/clothing/suit/armor/carrier/ablative,
-/obj/item/clothing/head/helmet/ablative,
-/obj/item/clothing/head/helmet/ablative,
-/obj/structure/window/reinforced,
-/obj/machinery/door/window/brigdoor{
- req_access = list(216);
- dir = 4
- },
-/obj/item/clothing/glasses/safety/goggles/tactical{
- brand_name = "Hephaestus Industries"
- },
-/obj/item/clothing/glasses/safety/goggles/tactical{
- brand_name = "Hephaestus Industries"
- },
-/obj/item/clothing/glasses/safety/goggles/tactical{
- brand_name = "Hephaestus Industries"
- },
+/obj/machinery/suit_cycler/offship/hephaestus,
/turf/simulated/floor,
/area/heph_security_ship/armory)
"Nj" = (
@@ -5509,25 +5467,40 @@
/turf/simulated/floor/airless,
/area/space)
"QJ" = (
-/obj/effect/floor_decal/industrial/hatch/red,
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8;
+ layer = 2.71
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(216);
- name = "ballistics"
+ name = "armor"
},
-/obj/item/gun/projectile/shotgun/pump/combat,
-/obj/item/gun/projectile/automatic/rifle/jingya{
- magazine_type = /obj/item/ammo_magazine/a556/carbine
+/obj/item/clothing/suit/armor/carrier/ablative,
+/obj/item/clothing/suit/armor/carrier/ablative,
+/obj/item/clothing/glasses/safety/goggles/tactical{
+ brand_name = "Hephaestus Industries"
},
-/obj/item/gun/projectile/automatic/rifle/jingya{
- magazine_type = /obj/item/ammo_magazine/a556/carbine
+/obj/item/clothing/glasses/safety/goggles/tactical{
+ brand_name = "Hephaestus Industries"
},
-/obj/item/gun/projectile/sec/lethal,
-/obj/item/gun/projectile/sec/lethal,
-/obj/item/gun/projectile/sec/lethal,
-/obj/item/gun/projectile/sec/lethal,
-/obj/item/gun/projectile/sec/lethal,
-/obj/item/gun/projectile/automatic/wt550/lethal,
-/obj/item/gun/projectile/automatic/wt550/lethal,
+/obj/item/clothing/glasses/safety/goggles/tactical{
+ brand_name = "Hephaestus Industries"
+ },
+/obj/item/clothing/glasses/safety/goggles/tactical{
+ brand_name = "Hephaestus Industries"
+ },
+/obj/item/clothing/glasses/safety/goggles/tactical{
+ brand_name = "Hephaestus Industries"
+ },
+/obj/item/clothing/head/helmet/ablative,
+/obj/item/clothing/head/helmet/ablative,
+/obj/item/clothing/head/helmet/ballistic,
+/obj/item/clothing/head/helmet/ballistic,
+/obj/item/clothing/suit/armor/carrier/ballistic,
+/obj/item/clothing/suit/armor/carrier/ballistic,
/turf/simulated/floor/tiled/dark/full,
/area/heph_security_ship/armory)
"QR" = (
@@ -6372,9 +6345,6 @@
/area/heph_security_ship/crew)
"Yl" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5;
pixel_y = 0
@@ -6382,6 +6352,9 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/heph_security_ship/armory)
"Yo" = (
@@ -38067,7 +38040,7 @@ rp
qv
VE
qG
-kY
+Nh
Nh
Iz
xN
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm
index 43c85f82726..cf3ba068262 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dmm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dmm
@@ -6626,26 +6626,8 @@
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/hangar)
"pc" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/kataphract/lead,
-/obj/item/clothing/head/helmet/space/void/kataphract/lead,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/machinery/door/window{
- name = "Knight Captain";
- req_access = list(114)
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/kataphract/lead,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/commissary)
"pf" = (
@@ -7074,6 +7056,12 @@
/obj/structure/table/rack,
/obj/item/melee/hammer/powered/hegemony,
/obj/item/melee/hammer/powered/hegemony,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/commissary)
"sB" = (
@@ -7885,6 +7873,7 @@
/obj/item/clothing/shoes/magboots/hegemony,
/obj/item/clothing/glasses/sunglasses/blinders,
/obj/item/device/gps,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/commissary)
"AG" = (
@@ -9944,27 +9933,9 @@
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/brig)
"TN" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/item/clothing/suit/space/void/kataphract/spec,
-/obj/item/clothing/head/helmet/space/void/kataphract/spec,
-/obj/item/clothing/mask/breath,
-/obj/machinery/door/window{
- name = "Specialist";
- req_one_access = list(114,116)
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4;
- icon_state = "rwindow"
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
/obj/structure/sign/flag/hegemony/large/east,
-/obj/item/device/gps,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/suit_cycler/offship/kataphract/specialist,
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/commissary)
"TP" = (
@@ -10070,12 +10041,8 @@
/turf/simulated/floor/plating,
/area/kataphract_chapter/portpropulsion)
"Vj" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/kataphract,
-/obj/item/clothing/head/helmet/space/void/kataphract,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/shoes/magboots/hegemony,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/kataphract,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/kataphract_chapter/commissary)
"VG" = (
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index 9d39967097e..632683c9d00 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -3932,10 +3932,15 @@
/obj/effect/floor_decal/corner_wide/dark_blue{
dir = 5
},
-/obj/machinery/suit_cycler{
- req_access = null
- },
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
+/obj/item/clothing/accessory/flagpatch/konyang,
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/armory)
"xK" = (
@@ -4122,6 +4127,22 @@
/obj/effect/floor_decal/corner_wide/dark_blue{
dir = 5
},
+/obj/structure/table/rack,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/armory)
"yr" = (
@@ -5171,25 +5192,6 @@
},
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/kasf_corvette/starboardthrust)
-"DZ" = (
-/obj/structure/table/rack,
-/obj/machinery/door/window/eastright{
- dir = 1;
- req_one_access = list(218)
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/item/device/suit_cooling_unit,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/konyang,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/item/device/gps,
-/turf/simulated/floor/carpet/rubber,
-/area/ship/kasf_corvette/armory)
"Ea" = (
/obj/structure/railing/mapped{
dir = 8
@@ -6240,25 +6242,6 @@
},
/turf/simulated/floor/carpet/rubber,
/area/shuttle/kasf_shuttle)
-"Jh" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/door/window/westleft{
- dir = 2;
- req_one_access = list(218)
- },
-/obj/item/device/suit_cooling_unit,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/konyang,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/item/device/gps,
-/turf/simulated/floor/carpet/rubber,
-/area/ship/kasf_corvette/armory)
"Jj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 10
@@ -6563,25 +6546,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
/area/ship/kasf_corvette/mainhall)
-"Ld" = (
-/obj/structure/table/rack,
-/obj/machinery/door/window/eastleft{
- dir = 1;
- req_one_access = list(218)
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/item/device/suit_cooling_unit,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/konyang,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/item/device/gps,
-/turf/simulated/floor/carpet/rubber,
-/area/ship/kasf_corvette/armory)
"Li" = (
/obj/effect/floor_decal/corner_wide/dark_blue/full{
dir = 8
@@ -7480,6 +7444,22 @@
/obj/effect/floor_decal/corner_wide/dark_blue{
dir = 5
},
+/obj/structure/table/rack,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/armory)
"Qq" = (
@@ -7754,22 +7734,8 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/porthangarfoyer)
"RJ" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/westright{
- dir = 2;
- req_one_access = list(218)
- },
-/obj/item/device/suit_cooling_unit,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/accessory/flagpatch/konyang,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/konyang,
-/obj/item/clothing/head/helmet/space/void/sol/konyang,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/konyang,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/carpet/rubber,
/area/ship/kasf_corvette/armory)
"RO" = (
@@ -41428,9 +41394,9 @@ vn
AD
Iq
Ui
-Jh
+RJ
gu
-Ld
+RJ
yx
yx
Mb
@@ -41687,7 +41653,7 @@ Di
Ui
rB
gu
-DZ
+RJ
yx
gl
xg
@@ -43229,7 +43195,7 @@ sd
Ui
LR
EV
-Ld
+RJ
yx
vV
YK
@@ -43486,7 +43452,7 @@ ql
Ui
RJ
EV
-DZ
+RJ
yx
yx
zv
diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
index 1b2f1aa5bb5..440810014c7 100644
--- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
+++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
@@ -669,9 +669,6 @@
temperature = 278.15
},
/area/nka_merchant/warehouse)
-"cd" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/mess)
"ce" = (
/obj/structure/table/standard,
/obj/item/device/flashlight/lamp,
@@ -934,9 +931,6 @@
temperature = 278.15
},
/area/nka_merchant/warehouse)
-"cR" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/engine)
"cS" = (
/obj/structure/cable/green{
d2 = 2;
@@ -1123,25 +1117,11 @@
},
/area/nka_merchant/captain_quarters)
"dF" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastright{
- dir = 2;
- req_access = list(213);
- name = "Voidsuit"
- },
/obj/machinery/light{
dir = 1
},
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/nka,
-/obj/item/clothing/head/helmet/space/void/nka,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/nka,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -1835,26 +1815,9 @@
temperature = 278.15
},
/area/nka_merchant/eva)
-"gY" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/nka_merchant_shuttle)
"hc" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastright{
- dir = 2;
- req_access = list(213);
- name = "Voidsuit"
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/security,
-/obj/item/clothing/head/helmet/space/void/security,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/nka,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -2004,27 +1967,6 @@
temperature = 278.15
},
/area/nka_merchant/mess)
-"ig" = (
-/obj/structure/table/rack,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastright{
- dir = 2;
- req_access = list(213);
- name = "Voidsuit"
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/nka,
-/obj/item/clothing/head/helmet/space/void/nka,
-/obj/item/device/gps,
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
-/area/nka_merchant/eva)
"ih" = (
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
@@ -3295,17 +3237,6 @@
temperature = 278.15
},
/area/nka_merchant/mess)
-"rc" = (
-/obj/effect/floor_decal/corner/dark_blue{
- dir = 10
- },
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
-/area/nka_merchant)
-"rk" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/barracks)
"rp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6;
@@ -3324,9 +3255,12 @@
},
/area/nka_merchant/mess)
"rq" = (
-/obj/machinery/suit_cycler/security{
- req_access = list(213)
- },
+/obj/structure/table/rack,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -3647,9 +3581,6 @@
temperature = 278.15
},
/area/nka_merchant/warehouse)
-"yk" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/captain_quarters)
"yr" = (
/obj/structure/bed/padded,
/obj/item/bedsheet/blue,
@@ -3808,15 +3739,9 @@
},
/turf/simulated/wall/shuttle/space_ship,
/area/nka_merchant)
-"CW" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/warehouse)
"Df" = (
/turf/simulated/wall/shuttle/space_ship,
/area/shuttle/nka_merchant_shuttle)
-"Dj" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/hangar)
"Do" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6;
@@ -4498,9 +4423,6 @@
temperature = 278.15
},
/area/nka_merchant/bridge/secondary)
-"QW" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant)
"RC" = (
/obj/structure/table/standard,
/obj/item/device/flashlight/lamp,
@@ -4694,9 +4616,6 @@
temperature = 278.15
},
/area/nka_merchant/bridge)
-"Vy" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/nka_merchant/engineering)
"Wl" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15924,11 +15843,11 @@ iB
iB
iB
iB
-cR
-cR
-cR
-cR
-cR
+AT
+AT
+AT
+AT
+AT
iB
iB
iB
@@ -16090,23 +16009,23 @@ vo
RS
Zr
AT
-cR
-cR
+AT
+AT
vA
vA
Wx
Wx
iu
-Vy
-Vy
+pA
+pA
UT
-Vy
-Vy
-rk
-rk
-rk
-rk
-rk
+pA
+pA
+fJ
+fJ
+fJ
+fJ
+fJ
JO
iB
iB
@@ -16253,23 +16172,23 @@ dV
Zr
cr
AT
-cR
+AT
jA
vA
bg
Wx
-Vy
+pA
cS
gN
lO
bA
mK
-rk
+fJ
yr
Xf
lh
-rk
-yk
+fJ
+JO
DU
DU
DU
@@ -16284,7 +16203,7 @@ aO
aO
aO
Vp
-QW
+Vp
iB
iB
iB
@@ -16415,22 +16334,22 @@ Fy
RS
Zr
Zr
-cR
+AT
jA
vA
Wx
Wx
-Vy
+pA
lZ
mv
ik
bA
qt
-rk
-rk
+fJ
+fJ
Hu
lh
-rk
+fJ
uy
Dx
cP
@@ -16445,8 +16364,8 @@ bS
Fm
Fm
aE
-QW
-QW
+Vp
+Vp
cf
iB
iB
@@ -16572,27 +16491,27 @@ iB
iB
iB
iB
-cR
-cR
+AT
+AT
aI
Zr
eD
-cR
+AT
vA
vA
Wx
Wx
-Vy
+pA
dI
Ew
mO
bA
HR
-rk
+fJ
yr
Hu
at
-rk
+fJ
ak
fm
MA
@@ -16607,10 +16526,10 @@ dZ
nA
kZ
cp
-QW
-QW
-QW
-QW
+Vp
+Vp
+Vp
+Vp
kI
kI
kI
@@ -16735,26 +16654,26 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
Zr
-cR
+AT
hx
dO
Wx
bI
-Vy
+pA
kv
iO
gw
bb
qK
-rk
-rk
+fJ
+fJ
cq
em
-rk
+fJ
co
fm
Qh
@@ -16769,7 +16688,7 @@ fZ
TP
nA
cp
-QW
+Vp
Vp
Tu
Vp
@@ -16897,26 +16816,26 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
Zr
-cR
+AT
xX
IA
IA
jw
-Vy
+pA
gg
Pb
yD
bA
aN
-rk
+fJ
yr
Hu
jE
-rk
+fJ
Oa
Oz
OJ
@@ -16931,7 +16850,7 @@ gi
cN
cN
ho
-QW
+Vp
AY
ms
gM
@@ -17059,23 +16978,23 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
Zr
-cR
+AT
vA
vA
fQ
vA
-Vy
+pA
cM
Sg
aP
bA
kV
-rk
-rk
+fJ
+fJ
Hu
ce
fJ
@@ -17087,13 +17006,13 @@ JO
Vj
Vj
Vj
-cd
+Vj
qm
lT
eV
eV
EU
-QW
+Vp
aJ
xc
ih
@@ -17221,31 +17140,31 @@ iB
iB
iB
iB
-cR
+AT
aI
ga
fk
-cR
-ig
+AT
+hc
bq
bq
cT
-Vy
+pA
yK
GV
Ni
bA
br
-rk
+fJ
og
Hu
PP
kw
-rk
+fJ
Ea
ca
df
-QW
+Vp
PJ
eB
eB
@@ -17255,7 +17174,7 @@ io
ie
kg
Kg
-QW
+Vp
aJ
xc
HS
@@ -17264,7 +17183,7 @@ kI
kI
kI
kI
-QW
+Vp
iB
iB
iB
@@ -17383,23 +17302,23 @@ iB
iB
iB
iB
-cR
+AT
aI
et
iT
-cR
-ig
+AT
+hc
bq
gU
sn
-Vy
+pA
NJ
ax
kW
bA
bs
-rk
-rk
+fJ
+fJ
ny
xP
lW
@@ -17407,7 +17326,7 @@ JX
eE
bH
ih
-QW
+Vp
Si
eB
eB
@@ -17417,17 +17336,17 @@ rs
aD
EP
qY
-QW
+Vp
fv
Fd
lu
-QW
+Vp
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -17545,31 +17464,31 @@ iB
iB
iB
iB
-cR
+AT
aI
et
iT
-cR
+AT
dF
bq
GP
bL
-Vy
+pA
kD
ls
cx
dj
UB
-rk
+fJ
kS
bR
jF
Yo
-rk
+fJ
aJ
xc
ih
-QW
+Vp
eF
eB
iw
@@ -17579,18 +17498,18 @@ rp
pf
kL
eV
-QW
+Vp
aJ
xc
-rc
-QW
+ih
+Vp
pL
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -17706,27 +17625,27 @@ iB
iB
iB
iB
-cR
+AT
AT
aI
TU
wQ
-cR
-ig
+AT
+hc
bq
fK
Jv
-Vy
+pA
ZX
kC
So
ED
bu
-rk
-rk
-rk
-rk
-rk
+fJ
+fJ
+fJ
+fJ
+fJ
fJ
fI
xc
@@ -17741,19 +17660,19 @@ nE
Vj
Vj
Vj
-QW
+Vp
fI
xc
ih
Vp
-QW
-QW
+Vp
+Vp
Vp
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -17873,18 +17792,18 @@ RS
aI
gh
iY
-cR
+AT
hc
bq
Do
gv
-Vy
+pA
bE
oT
aT
aS
bv
-Vy
+pA
ni
yc
yc
@@ -17903,20 +17822,20 @@ ca
cK
cK
wP
-QW
+Vp
nw
xc
ih
RM
aj
bc
-QW
+Vp
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -18035,18 +17954,18 @@ kx
kx
am
iY
-cR
+AT
rq
jl
ia
cH
-Vy
+pA
bE
YT
ks
ao
IJ
-Vy
+pA
uh
yc
ab
@@ -18072,13 +17991,13 @@ ih
eH
mR
lJ
-QW
+Vp
pL
pL
pL
pL
pL
-QW
+Vp
Ck
iB
iB
@@ -18197,17 +18116,17 @@ fH
aI
Zr
iY
-cR
+AT
vA
vA
vV
vA
-Vy
-Vy
-Vy
-Vy
+pA
+pA
+pA
+pA
No
-Vy
+pA
pA
mE
yc
@@ -18227,20 +18146,20 @@ cm
Ka
cm
EC
-QW
+Vp
nw
xc
ih
hS
yv
je
-QW
+Vp
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -18354,12 +18273,12 @@ iB
iB
iB
iB
-cR
+AT
AT
aI
Zr
Zr
-cR
+AT
Bv
tw
nz
@@ -18374,34 +18293,34 @@ wt
wt
wt
bY
-Dj
TH
-CW
-CW
-CW
-CW
-CW
-CW
-CW
+TH
+WZ
+WZ
+WZ
+WZ
+WZ
+WZ
+WZ
JF
wr
wr
kj
wr
wr
-QW
+Vp
fI
xc
OT
Vp
-QW
-QW
+Vp
+Vp
Vp
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -18517,7 +18436,7 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
OL
@@ -18538,12 +18457,12 @@ yc
iK
dn
dq
-CW
+WZ
WZ
cQ
-CW
+WZ
ec
-CW
+WZ
ci
bM
wr
@@ -18551,18 +18470,18 @@ lk
Ci
ma
RC
-QW
+Vp
iq
xc
lu
-QW
+Vp
pL
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -18679,11 +18598,11 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
jn
-cR
+AT
iU
bF
kA
@@ -18700,7 +18619,7 @@ kA
lL
gK
al
-CW
+WZ
fa
bM
Ja
@@ -18713,17 +18632,17 @@ dJ
DK
NZ
aw
-QW
+Vp
hV
jm
-rc
-QW
+ih
+Vp
pL
pL
pL
pL
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -18841,14 +18760,14 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
Ll
-cR
+AT
fq
YM
-gY
+Df
Df
Df
Df
@@ -18875,7 +18794,7 @@ dD
db
la
jX
-QW
+Vp
aJ
xc
HS
@@ -18884,7 +18803,7 @@ UL
UL
UL
UL
-QW
+Vp
iB
iB
iB
@@ -19003,15 +18922,15 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
jn
-cR
+AT
hf
ht
Df
-gY
+Df
bQ
nh
le
@@ -19024,7 +18943,7 @@ pi
iZ
yc
it
-CW
+WZ
jJ
bM
kH
@@ -19037,7 +18956,7 @@ ea
bB
lS
ji
-QW
+Vp
aJ
xc
ih
@@ -19165,11 +19084,11 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
jn
-cR
+AT
En
ht
du
@@ -19199,7 +19118,7 @@ az
FC
lp
eA
-QW
+Vp
dX
bV
iz
@@ -19327,15 +19246,15 @@ iB
iB
iB
iB
-cR
+AT
aI
Zr
zi
-cR
+AT
iU
ht
Df
-gY
+Df
LV
fd
iF
@@ -19348,7 +19267,7 @@ pi
iZ
yc
bj
-CW
+WZ
kQ
bM
lR
@@ -19361,7 +19280,7 @@ hI
cF
gc
fi
-QW
+Vp
Vp
Wr
Vp
@@ -19488,15 +19407,15 @@ iB
iB
iB
iB
-cR
-cR
+AT
+AT
aI
Zr
Zr
-cR
+AT
iU
kU
-gY
+Df
Df
Df
Df
@@ -19510,7 +19429,7 @@ Df
iZ
yc
mj
-CW
+WZ
cc
bM
aU
@@ -19523,10 +19442,10 @@ vQ
hF
TN
ae
-QW
-QW
-QW
-QW
+Vp
+Vp
+Vp
+Vp
UL
UL
UL
@@ -19654,8 +19573,8 @@ vo
TF
XG
AT
-cR
-cR
+AT
+AT
hf
zm
cl
@@ -19672,10 +19591,10 @@ cl
jy
yc
mj
-CW
+WZ
WZ
gm
-CW
+WZ
aq
wT
cB
@@ -19685,8 +19604,8 @@ lX
tx
dK
GE
-QW
-QW
+Vp
+Vp
gB
iB
iB
@@ -19817,7 +19736,7 @@ dV
Zr
aH
mg
-cR
+AT
aX
yc
yc
@@ -19833,22 +19752,22 @@ dA
yc
yc
it
-Dj
-CW
-CW
-CW
-CW
-CW
-CW
-CW
+TH
+WZ
+WZ
+WZ
+WZ
+WZ
+WZ
+WZ
ll
wr
wr
wr
wr
wr
-QW
-QW
+Vp
+Vp
iB
iB
iB
@@ -19977,9 +19896,9 @@ iB
vo
fH
Zr
-cR
-cR
-cR
+AT
+AT
+AT
TH
oh
oh
@@ -19996,7 +19915,7 @@ oh
oh
TH
TH
-CW
+WZ
iB
iB
iB
@@ -20136,11 +20055,11 @@ iB
iB
iB
iB
-cR
-cR
-cR
-cR
-cR
+AT
+AT
+AT
+AT
+AT
iB
iB
iB
diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm
index fdcb91318ae..08ce7e6dc34 100644
--- a/maps/away/ships/pra/database_freighter/database_freighter.dmm
+++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm
@@ -405,9 +405,8 @@
},
/area/database_freighter/storage)
"bL" = (
-/obj/machinery/suit_cycler/science{
- req_access = list(209)
- },
+/obj/structure/closet/firecloset,
+/obj/effect/floor_decal/industrial/outline/firefighting_closet,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -1548,6 +1547,11 @@
/obj/item/device/radio,
/obj/structure/table/standard,
/obj/structure/extinguisher_cabinet/north,
+/obj/item/device/gps/science,
+/obj/item/device/gps/science,
+/obj/item/device/gps/science,
+/obj/item/device/gps/science,
+/obj/item/device/gps/science,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -3177,6 +3181,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline/emergency_closet,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -3812,20 +3817,8 @@
},
/area/database_freighter/engineering)
"IX" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
-/obj/structure/window/reinforced{
- dir = 1
- },
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/mask/breath,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/item/device/gps/science,
+/obj/machinery/suit_cycler/offship/pra,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
index 98468dfa5d5..1f323d5fb68 100644
--- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm
+++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
@@ -293,11 +293,6 @@
temperature = 278.15
},
/area/headmaster_ship/engine)
-"aM" = (
-/turf/simulated/floor/carpet/art{
- temperature = 278.15
- },
-/area/headmaster_ship/captain_quarters)
"aN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 4
@@ -373,15 +368,6 @@
temperature = 278.15
},
/area/headmaster_ship/gun_deck)
-"aZ" = (
-/obj/structure/bed/stool/bar/padded/red,
-/obj/effect/floor_decal/corner/brown{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/headmaster_ship/mess_hall)
"ba" = (
/obj/machinery/vending/wallmed2{
req_access = null;
@@ -438,15 +424,9 @@
},
/area/headmaster_ship/armory)
"bj" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
-/obj/structure/window/reinforced,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/mask/breath,
/obj/machinery/light,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/pra,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -1300,6 +1280,13 @@
/obj/item/device/radio,
/obj/item/device/radio,
/obj/structure/table/standard,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -2202,14 +2189,8 @@
},
/area/headmaster_ship/engine)
"gY" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
-/obj/structure/window/reinforced,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/mask/breath,
-/obj/item/device/gps,
+/obj/machinery/suit_cycler/offship/pra,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -3137,22 +3118,6 @@
temperature = 278.15
},
/area/headmaster_ship/armory)
-"jX" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/mask/breath,
-/obj/item/device/gps,
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/headmaster_ship/hangar)
"kb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -3839,22 +3804,6 @@
temperature = 278.15
},
/area/headmaster_ship/medbay)
-"mv" = (
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pra,
-/obj/item/clothing/head/helmet/space/void/pra,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/clothing/mask/breath,
-/obj/item/device/gps,
-/turf/simulated/floor/tiled/dark{
- temperature = 278.15
- },
-/area/headmaster_ship/hangar)
"mx" = (
/obj/effect/floor_decal/industrial/loading/yellow{
dir = 8
@@ -3874,11 +3823,6 @@
temperature = 278.15
},
/area/headmaster_ship/hangar)
-"mE" = (
-/turf/simulated/floor/carpet/art{
- temperature = 278.15
- },
-/area/headmaster_ship/commissar_quarters)
"mF" = (
/obj/machinery/light/small/emergency{
dir = 4
@@ -16140,7 +16084,7 @@ NZ
cc
ub
ub
-mv
+gY
NZ
NZ
eH
@@ -16626,7 +16570,7 @@ NZ
dK
jJ
tb
-jX
+gY
NZ
eH
xT
@@ -16950,7 +16894,7 @@ NZ
Rm
mZ
ub
-mv
+gY
NZ
nW
NZ
@@ -17112,7 +17056,7 @@ NZ
hW
yM
gc
-jX
+gY
NZ
dm
NZ
@@ -18883,7 +18827,7 @@ hY
Fm
Fm
Fm
-aZ
+fK
ho
ho
ho
@@ -20001,7 +19945,7 @@ bu
Up
No
tY
-mE
+bT
bT
ek
fb
@@ -20015,7 +19959,7 @@ cm
qg
JF
PV
-aM
+PV
tB
bR
WG
diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm
index bd0b5857e41..23e74c2adc3 100644
--- a/maps/away/ships/scc/scc_scout_ship.dmm
+++ b/maps/away/ships/scc/scc_scout_ship.dmm
@@ -2124,16 +2124,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/hydroponics)
"lV" = (
-/obj/machinery/suit_cycler/medical{
- req_access = null
- },
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/medical,
-/obj/item/clothing/head/helmet/space/void/medical,
/obj/effect/floor_decal/industrial/outline/medical,
/obj/machinery/light{
dir = 8
},
+/obj/machinery/suit_cycler/medical/prepared{
+ req_access = null
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/eva)
"lW" = (
@@ -2597,13 +2594,10 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/suit_cycler/mining{
+/obj/effect/floor_decal/industrial/outline/engineering,
+/obj/machinery/suit_cycler/mining/prepared{
req_access = null
},
-/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/mining,
-/obj/item/clothing/head/helmet/space/void/mining,
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/eva)
"ov" = (
@@ -4226,13 +4220,10 @@
/turf/simulated/floor/tiled/white,
/area/ship/scc_scout_ship/medbay)
"yj" = (
-/obj/machinery/suit_cycler/science{
+/obj/effect/floor_decal/industrial/outline/research,
+/obj/machinery/suit_cycler/science/prepared{
req_access = null
},
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sci,
-/obj/item/clothing/head/helmet/space/void/sci,
-/obj/effect/floor_decal/industrial/outline/research,
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/eva)
"yp" = (
@@ -5420,13 +5411,10 @@
/turf/simulated/floor/tiled/white,
/area/shuttle/scc_scout_ship_shuttle/medbay)
"Ht" = (
-/obj/machinery/suit_cycler/engineering{
+/obj/effect/floor_decal/industrial/outline/engineering,
+/obj/machinery/suit_cycler/engineering/prepared{
req_access = null
},
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/engineering,
-/obj/item/clothing/head/helmet/space/void/engineering,
-/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/eva)
"Hv" = (
diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
index fa0d0e58ec7..2c7371f78a9 100644
--- a/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
+++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dmm
@@ -20,13 +20,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"aad" = (
-/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/machinery/door/airlock/security{
- name = "Messhall";
- req_access = list(203);
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
+/obj/machinery/suit_cycler/offship/sol/fsf,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"aae" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -45,14 +41,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
-"aag" = (
-/obj/machinery/door/airlock/security{
- name = "Engineering";
- req_access = list(203);
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/ship/fsf_patrol_ship)
"aah" = (
/obj/machinery/door/airlock/security{
name = "Engineering";
@@ -69,22 +57,6 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/fsf_patrol_ship)
-"aaj" = (
-/obj/machinery/door/airlock/security{
- name = "Head";
- req_access = list(203);
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/ship/fsf_patrol_ship)
-"aak" = (
-/obj/machinery/door/airlock/security{
- name = "EVA";
- req_access = list(203);
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/ship/fsf_patrol_ship)
"aaI" = (
/obj/machinery/atmospherics/unary/engine,
/obj/structure/window/reinforced,
@@ -727,19 +699,12 @@
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"eOW" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/sol/fsf,
-/obj/item/clothing/head/helmet/space/void/sol/fsf,
/obj/machinery/light{
inserted_light = /obj/item/light/tube/colored/blue;
icon_state = "tube_empty"
},
-/obj/item/device/gps,
-/obj/item/clothing/glasses/safety/goggles/tactical,
-/obj/item/clothing/mask/gas/half,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/sol/fsf,
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"eTq" = (
@@ -1406,16 +1371,24 @@
"iQt" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
/obj/machinery/light{
inserted_light = /obj/item/light/tube/colored/blue;
icon_state = "tube_empty"
},
/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/sol/fsf,
-/obj/item/clothing/head/helmet/space/void/sol/fsf,
/obj/item/device/gps,
-/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/mask/gas/half,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/device/gps,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/half,
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
@@ -1504,10 +1477,6 @@
},
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
-"jGx" = (
-/obj/effect/floor_decal/corner/paleblue/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/ship/fsf_patrol_ship)
"jHa" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/door/airlock/security{
@@ -1746,14 +1715,7 @@
/area/ship/fsf_patrol_ship)
"lwj" = (
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/sol/fsf,
-/obj/item/clothing/head/helmet/space/void/sol/fsf,
-/obj/item/device/gps,
-/obj/item/clothing/glasses/safety/goggles/tactical,
-/obj/item/clothing/mask/gas/half,
+/obj/machinery/suit_cycler/offship/sol/fsf,
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"lBQ" = (
@@ -2699,19 +2661,12 @@
/turf/simulated/floor/tiled/white,
/area/ship/fsf_patrol_ship)
"vfY" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
/obj/machinery/light{
dir = 1;
icon_state = "tube_empty"
},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/sol/fsf,
-/obj/item/clothing/head/helmet/space/void/sol/fsf,
-/obj/item/device/gps,
-/obj/item/clothing/glasses/safety/goggles/tactical,
-/obj/item/clothing/mask/gas/half,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/sol/fsf,
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"vgc" = (
@@ -32301,9 +32256,9 @@ yjk
yjk
mwV
vOB
-jGx
-jGx
-jGx
+eYk
+eYk
+eYk
lcg
yjk
yjk
@@ -32560,12 +32515,12 @@ eTH
krH
krH
heP
-jGx
-jGx
+eYk
+eYk
yjk
vfY
lwj
-sSs
+aad
lwj
eOW
yjk
@@ -32817,8 +32772,8 @@ eYk
vCD
vCD
lRe
-jGx
-jGx
+eYk
+eYk
jHa
sSs
sSs
@@ -33070,11 +33025,11 @@ lNu
xto
dHE
uHi
-jGx
+eYk
krH
krH
heP
-jGx
+eYk
aGW
yjk
uvX
@@ -33329,8 +33284,8 @@ xto
yjk
jdD
gXx
-jGx
-jGx
+eYk
+eYk
gXx
nKS
yjk
@@ -33586,7 +33541,7 @@ yjk
yjk
yjk
yjk
-aad
+aae
aae
yjk
yjk
@@ -35639,7 +35594,7 @@ sSs
mEc
keV
sSs
-aag
+aah
hBs
sSs
gqO
@@ -37444,7 +37399,7 @@ uYP
uYP
uYP
uYP
-aaj
+aai
kYY
kYY
yjk
@@ -37960,7 +37915,7 @@ uYP
jxF
yjk
yjk
-aak
+aaf
yjk
yjk
yjk
diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
index f46cb884e23..d7812fe1d8a 100644
--- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
@@ -220,6 +220,34 @@
/obj/machinery/power/apc/west{
req_access = list(113)
},
+/obj/machinery/alarm/north,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/radio/off,
+/obj/item/device/radio/off,
+/obj/item/device/radio/off,
+/obj/item/device/radio/off,
+/obj/item/device/radio/off,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Suit_Storage)
"aDq" = (
@@ -1221,19 +1249,12 @@
/area/ship/sfa_patrol_ship/Suit_Storage)
"eJN" = (
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/table/rack,
-/obj/item/clothing/shoes/magboots,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/suit/space/void/sol/sfa,
-/obj/item/clothing/head/helmet/space/void/sol/sfa,
/obj/machinery/light{
inserted_light = /obj/item/light/tube/colored/blue;
icon_state = "tube_empty"
},
-/obj/item/device/radio/off,
-/obj/item/device/gps,
-/obj/item/clothing/glasses/safety/goggles/tactical,
-/obj/item/clothing/mask/gas/half,
+/obj/machinery/suit_cycler/offship/sol/sfa,
+/obj/machinery/suit_cycler/offship/sol/sfa,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Suit_Storage)
"eLQ" = (
@@ -3025,8 +3046,13 @@
/turf/simulated/floor,
/area/ship/sfa_patrol_ship/Engine2)
"mgf" = (
-/obj/machinery/alarm/west,
-/turf/simulated/wall/shuttle/raider,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light{
+ inserted_light = /obj/item/light/tube/colored/blue;
+ icon_state = "tube_empty"
+ },
+/obj/machinery/suit_cycler/offship/sol/sfa,
+/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Suit_Storage)
"mhc" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -4590,6 +4616,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Suit_Storage)
+"tIq" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/suit_cycler/offship/sol/sfa,
+/turf/simulated/floor/tiled/dark,
+/area/ship/sfa_patrol_ship/Suit_Storage)
"tIr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 6
@@ -5163,6 +5194,11 @@
},
/turf/simulated/floor/holofloor/wood,
/area/ship/sfa_patrol_ship/Quarters)
+"wCp" = (
+/obj/machinery/suit_cycler/offship/sol/sfa,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/dark,
+/area/ship/sfa_patrol_ship/Suit_Storage)
"wDs" = (
/obj/structure/inflatable/door,
/turf/unsimulated/floor,
@@ -23350,7 +23386,7 @@ sBA
fkj
gUT
aCY
-eJN
+tIq
wQt
wQt
eJN
@@ -23863,11 +23899,11 @@ xEZ
xRe
taa
eme
-wQt
-eJN
+wCp
+mgf
ahU
kFw
-eJN
+mgf
gUT
vKl
vKl
@@ -24120,7 +24156,7 @@ kbh
rOk
fkj
eme
-mgf
+gUT
gUT
gUT
gUT
diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol_ssmd/ssmd_ship.dmm
index 054503cfc71..f17a8f309f4 100644
--- a/maps/away/ships/sol_ssmd/ssmd_ship.dmm
+++ b/maps/away/ships/sol_ssmd/ssmd_ship.dmm
@@ -208,21 +208,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/synthroom)
"aHw" = (
-/obj/structure/closet,
/obj/effect/floor_decal/corner/grey/full{
dir = 8
},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/ssmd,
-/obj/item/clothing/head/helmet/space/void/sol/ssmd,
-/obj/item/tank/emergency_oxygen/double,
/obj/machinery/light/colored/blue{
dir = 8
},
-/obj/item/device/gps,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/machinery/suit_cycler/offship/sol/ssmd,
+/obj/effect/floor_decal/industrial/outline/yellow{
+ layer = 2.71
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"aHC" = (
@@ -445,19 +440,14 @@
/turf/template_noop,
/area/ship/ssmd_corvette/hangar)
"bci" = (
-/obj/structure/closet,
/obj/effect/floor_decal/corner/grey/full,
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/ssmd,
-/obj/item/clothing/head/helmet/space/void/sol/ssmd,
-/obj/item/tank/emergency_oxygen/double,
/obj/machinery/light/colored/blue{
dir = 8
},
-/obj/item/device/gps,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/machinery/suit_cycler/offship/sol/ssmd,
+/obj/effect/floor_decal/industrial/outline/yellow{
+ layer = 2.71
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"bdq" = (
@@ -1706,8 +1696,6 @@
name = "Support Synthetic Equipment";
pixel_y = -32
},
-/obj/item/clothing/suit/space/void/freelancer,
-/obj/item/clothing/head/helmet/space/void/freelancer,
/obj/item/device/suit_cooling_unit,
/obj/item/gun/energy/plasmacutter,
/turf/simulated/floor/tiled/dark,
@@ -2626,18 +2614,13 @@
/turf/simulated/floor/wood/birch,
/area/ship/ssmd_corvette/starboardfoyer)
"gHC" = (
-/obj/structure/closet,
/obj/effect/floor_decal/corner/grey{
dir = 5
},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/ssmd,
-/obj/item/clothing/head/helmet/space/void/sol/ssmd,
-/obj/item/tank/emergency_oxygen/double,
-/obj/item/device/gps,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/machinery/suit_cycler/offship/sol/ssmd,
+/obj/effect/floor_decal/industrial/outline/yellow{
+ layer = 2.71
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"gKp" = (
@@ -2868,21 +2851,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"hBd" = (
-/obj/structure/closet,
/obj/effect/floor_decal/corner/grey/full{
dir = 1
},
-/obj/item/tank/jetpack/carbondioxide,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/sol/ssmd,
-/obj/item/clothing/head/helmet/space/void/sol/ssmd,
-/obj/item/tank/emergency_oxygen/double,
/obj/machinery/light/colored/blue{
dir = 4
},
-/obj/item/device/gps,
-/obj/item/clothing/mask/gas/half,
-/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/machinery/suit_cycler/offship/sol/ssmd,
+/obj/effect/floor_decal/industrial/outline/yellow{
+ layer = 2.71
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"hBs" = (
@@ -3725,7 +3703,9 @@
/area/ship/ssmd_corvette/francisca)
"kqx" = (
/obj/effect/floor_decal/industrial/outline/engineering,
-/obj/machinery/suit_cycler/freelancer,
+/obj/machinery/suit_cycler/engineering/prepared{
+ req_access = list(203)
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/synthroom)
"krH" = (
@@ -7075,10 +7055,36 @@
/turf/simulated/floor/wood/birch,
/area/ship/ssmd_corvette/starboardfoyer)
"vwF" = (
-/obj/structure/closet/crate/bin{
- name = "trashbin"
- },
/obj/machinery/firealarm/south,
+/obj/effect/floor_decal/corner/grey{
+ dir = 10
+ },
+/obj/structure/closet,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/device/gps,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/emergency_oxygen/double,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
+/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark,
/area/ship/ssmd_corvette/dorms)
"vxe" = (
@@ -35631,7 +35637,7 @@ xyG
gHC
eBK
fRD
-dTw
+vwF
xyG
jTb
hGn
@@ -35888,7 +35894,7 @@ nda
xWT
eBK
ldU
-vwF
+dTw
xyG
tHH
ang
diff --git a/tgui/packages/tgui/interfaces/SuitCycler.tsx b/tgui/packages/tgui/interfaces/SuitCycler.tsx
index 632b11b11ee..5080f347c52 100644
--- a/tgui/packages/tgui/interfaces/SuitCycler.tsx
+++ b/tgui/packages/tgui/interfaces/SuitCycler.tsx
@@ -12,7 +12,9 @@ export type SuitCyclerData = {
model_text: string;
radiation_level: number;
target_department: string;
+ department_change: BooleanLike;
target_species: string;
+ species_change: BooleanLike;
helmet: SuitObject;
suit: SuitObject;
boots: SuitObject;
@@ -146,7 +148,9 @@ export const SuitCycler = (props, context) => {