diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 5985626735..cab1b8279b 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -82,26 +82,29 @@ containername = "advanced hardsuit crate" access = access_ce -/datum/supply_pack/misc/com_medical_rig - name = "commonwealth medical hardsuit (loaded)" +// CHOMPStation EDIT Start: Change Commonwealth to Solgov +/datum/supply_pack/misc/solgov_medical_rig + name = "solgov medical hardsuit (loaded)" contains = list( /obj/item/weapon/rig/baymed = 1 ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear - containername = "Commonwealth medical hardsuit crate" + containername = "Solgov medical hardsuit crate" access = access_medical -/datum/supply_pack/misc/com_engineering_rig - name = "commonwealth engineering hardsuit (loaded)" +/datum/supply_pack/misc/solgov_engineering_rig + name = "solgov engineering hardsuit (loaded)" contains = list( /obj/item/weapon/rig/bayeng = 1 ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear - containername = "Commonwealth medical hardsuit crate" + containername = "Solgov medical hardsuit crate" access = access_medical +// CHOMPStation EDIT End + /datum/supply_pack/misc/zero_rig name = "null hardsuit (jets)" contains = list( diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index bbe8fc094a..a769cc805d 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -42,101 +42,103 @@ // Surplus! -/datum/supply_pack/voidsuits/com_mining - name = "Commonwealth mining voidsuit" +// CHOMPStation EDIT Start: Change Commonwealth to Solgov. +/datum/supply_pack/voidsuits/solgov_mining + name = "Solgov mining voidsuit" contains = list( /obj/item/clothing/suit/space/void/mining/alt2, /obj/item/clothing/head/helmet/space/void/mining/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth mining voidsuit crate" + name = "Solgov mining voidsuit crate" access = access_mining -/datum/supply_pack/voidsuits/com_anomaly - name = "Commonwealth anomaly suit" +/datum/supply_pack/voidsuits/solgov_anomaly + name = "Solgov anomaly suit" contains = list( /obj/item/clothing/suit/space/anomaly/alt, /obj/item/clothing/head/helmet/space/anomaly/alt ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth anomaly suit crate" + name = "Solgov anomaly suit crate" access = access_xenoarch -/datum/supply_pack/voidsuits/com_riot - name = "Commonwealth riot voidsuit" +/datum/supply_pack/voidsuits/solgov_riot + name = "Solgov riot voidsuit" contains = list( /obj/item/clothing/suit/space/void/security/riot/alt, /obj/item/clothing/head/helmet/space/void/security/riot/alt ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth riot voidsuit crate" + name = "Solgov riot voidsuit crate" access = access_brig -/datum/supply_pack/voidsuits/com_pilot - name = "Commonwealth pilot voidsuit" +/datum/supply_pack/voidsuits/solgov_pilot + name = "Solgov pilot voidsuit" contains = list( /obj/item/clothing/suit/space/void/pilot/alt2, /obj/item/clothing/head/helmet/space/void/pilot/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth pilot voidsuit crate" + name = "Solgov pilot voidsuit crate" access = access_pilot -/datum/supply_pack/voidsuits/com_medical - name = "Commonwealth medical voidsuit" +/datum/supply_pack/voidsuits/solgov_medical + name = "Solgov medical voidsuit" contains = list( /obj/item/clothing/suit/space/void/medical/alt2, /obj/item/clothing/head/helmet/space/void/medical/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth medical voidsuit crate" -/datum/supply_pack/voidsuits/com_explore + name = "Solgov medical voidsuit crate" +/datum/supply_pack/voidsuits/solgov_explore - name = "Commonwealth exploration voidsuit" + name = "Solgov exploration voidsuit" contains = list( /obj/item/clothing/suit/space/void/exploration/alt2, /obj/item/clothing/head/helmet/space/void/exploration/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth exploration voidsuit crate" + name = "Solgov exploration voidsuit crate" access = access_explorer -/datum/supply_pack/voidsuits/com_engineer - name = "Commonwealth engineering voidsuit" +/datum/supply_pack/voidsuits/solgov_engineer + name = "Solgov engineering voidsuit" contains = list( /obj/item/clothing/suit/space/void/engineering/alt2, /obj/item/clothing/head/helmet/space/void/engineering/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth engineering voidsuit crate" + name = "Solgov engineering voidsuit crate" access = access_engine -/datum/supply_pack/voidsuits/com_atmos - name = "Commonwealth atmos voidsuit" +/datum/supply_pack/voidsuits/solgov_atmos + name = "Solgov atmos voidsuit" contains = list( /obj/item/clothing/suit/space/void/atmos/alt2, /obj/item/clothing/head/helmet/space/void/atmos/alt2 ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth atmos voidsuit crate" + name = "Solgov atmos voidsuit crate" access = access_atmospherics -/datum/supply_pack/voidsuits/com_captain - name = "Commonwealth captain voidsuit" +/datum/supply_pack/voidsuits/solgov_captain + name = "Solgov captain voidsuit" contains = list( /obj/item/clothing/suit/space/void/captain/alt, /obj/item/clothing/head/helmet/space/void/captain/alt ) cost = 150 containertype = /obj/structure/closet/crate/secure - name = "Commonwealth captain voidsuit crate" + name = "Solgov captain voidsuit crate" access = access_captain +// CHOMPStation EDIT End \ No newline at end of file diff --git a/code/game/machinery/suit_cycler_datums.dm b/code/game/machinery/suit_cycler_datums.dm index e796213acf..3fc8d01039 100644 --- a/code/game/machinery/suit_cycler_datums.dm +++ b/code/game/machinery/suit_cycler_datums.dm @@ -65,8 +65,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Reinforced Engineering" helmet_becomes = /obj/item/clothing/head/helmet/space/void/engineering/alt suit_becomes = /obj/item/clothing/suit/space/void/engineering/alt -/datum/suit_cycler_choice/department/eng/commonwealth_standard - name = "Commonwealth Engineering" +/datum/suit_cycler_choice/department/eng/solgov_standard + name = "Solgov Engineering" helmet_becomes = /obj/item/clothing/head/helmet/space/void/engineering/alt2 suit_becomes = /obj/item/clothing/suit/space/void/engineering/alt2 /datum/suit_cycler_choice/department/eng/atmospherics @@ -77,8 +77,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Heavy Duty Atmos" helmet_becomes = /obj/item/clothing/head/helmet/space/void/atmos/alt suit_becomes = /obj/item/clothing/suit/space/void/atmos/alt -/datum/suit_cycler_choice/department/eng/commonwealth_atmos - name = "Commonwealth Atmos" +/datum/suit_cycler_choice/department/eng/solgov_atmos + name = "Solgov Atmos" helmet_becomes = /obj/item/clothing/head/helmet/space/void/atmos/alt2 suit_becomes = /obj/item/clothing/suit/space/void/atmos/alt2 /datum/suit_cycler_choice/department/eng/hazmat @@ -102,8 +102,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Frontier Mining" helmet_becomes = /obj/item/clothing/head/helmet/space/void/mining/alt suit_becomes = /obj/item/clothing/suit/space/void/mining/alt -/datum/suit_cycler_choice/department/crg/commonwealth - name = "Commonwealth Mining" +/datum/suit_cycler_choice/department/crg/solgov + name = "Solgov Mining" helmet_becomes = /obj/item/clothing/head/helmet/space/void/mining/alt2 suit_becomes = /obj/item/clothing/suit/space/void/mining/alt2 @@ -116,8 +116,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Vey-Medical Streamlined" helmet_becomes = /obj/item/clothing/head/helmet/space/void/medical/alt suit_becomes = /obj/item/clothing/suit/space/void/medical/alt -/datum/suit_cycler_choice/department/med/commonwealth - name = "Commonwealth Medical" +/datum/suit_cycler_choice/department/med/solgov + name = "Solgov Medical" helmet_becomes = /obj/item/clothing/head/helmet/space/void/medical/alt2 suit_becomes = /obj/item/clothing/suit/space/void/medical/alt2 /datum/suit_cycler_choice/department/med/biohazard @@ -138,8 +138,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Crowd Control" helmet_becomes = /obj/item/clothing/head/helmet/space/void/security/riot suit_becomes = /obj/item/clothing/suit/space/void/security/riot -/datum/suit_cycler_choice/department/sec/commonwealth - name = "Commonwealth Crowd Control" +/datum/suit_cycler_choice/department/sec/solgov + name = "Solgov Crowd Control" helmet_becomes = /obj/item/clothing/head/helmet/space/void/security/riot/alt suit_becomes = /obj/item/clothing/suit/space/void/security/riot/alt /datum/suit_cycler_choice/department/sec/eva @@ -160,8 +160,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Old Exploration" helmet_becomes = /obj/item/clothing/head/helmet/space/void/exploration/alt suit_becomes = /obj/item/clothing/suit/space/void/exploration/alt -/datum/suit_cycler_choice/department/exp/commonwealth - name = "Commonwealth Exploration" +/datum/suit_cycler_choice/department/exp/solgov + name = "Solgov Exploration" helmet_becomes = /obj/item/clothing/head/helmet/space/void/exploration/alt2 suit_becomes = /obj/item/clothing/suit/space/void/exploration/alt2 @@ -174,8 +174,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Pilot Blue" helmet_becomes = /obj/item/clothing/head/helmet/space/void/pilot/alt suit_becomes = /obj/item/clothing/suit/space/void/pilot/alt -/datum/suit_cycler_choice/department/pil/commonwealth - name = "Commonwealth Pilot" +/datum/suit_cycler_choice/department/pil/solgov + name = "Solgov Pilot" helmet_becomes = /obj/item/clothing/head/helmet/space/void/pilot/alt2 suit_becomes = /obj/item/clothing/suit/space/void/pilot/alt2 @@ -184,8 +184,8 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Manager" helmet_becomes = /obj/item/clothing/head/helmet/space/void/captain suit_becomes = /obj/item/clothing/suit/space/void/captain -/datum/suit_cycler_choice/department/captain/commonwealth - name = "Commonwealth Captain" +/datum/suit_cycler_choice/department/captain/solgov + name = "Solgov Captain" helmet_becomes = /obj/item/clothing/head/helmet/space/void/captain/alt suit_becomes = /obj/item/clothing/suit/space/void/captain/alt diff --git a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm index 46c02b9e75..e544a10cfd 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm @@ -224,9 +224,10 @@ slowdown = 0 // Medical rig from bay +// CHOMPEdit: Commonwealth -> Solgov. /obj/item/weapon/rig/baymed - name = "\improper Commonwealth medical hardsuit control module" - desc = "A lightweight first responder hardsuit from the Commonwealth. Not suitable for combat use, but advanced myomer fibers can push the user to incredible speeds." + name = "\improper Solgov medical hardsuit control module" + desc = "A lightweight first responder hardsuit from Solgov. Not suitable for combat use, but advanced myomer fibers can push the user to incredible speeds." icon = 'icons/obj/rig_modules_vr.dmi' // the item default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob @@ -287,9 +288,10 @@ sprite_sheets_obj = null // Engineering/'Industrial' rig from bay +// CHOMPEdit: Commonwealth -> Solgov. /obj/item/weapon/rig/bayeng - name = "\improper Commonwealth engineering hardsuit control module" - desc = "An advanced construction hardsuit from the Commonwealth. Built like a tank. Don't expect to be taking any tight corners while running." + name = "\improper Solgov engineering hardsuit control module" + desc = "An advanced construction hardsuit from Solgov. Built like a tank. Don't expect to be taking any tight corners while running." icon = 'icons/obj/rig_modules_vr.dmi' // the item default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob @@ -350,9 +352,10 @@ siemens_coefficient = 0 // insulated // Pathfinder rig from bay - event/reward stuff here +// CHOMPEdit: Commonwealth -> Solgov. /obj/item/weapon/rig/pathfinder - name = "\improper Commonwealth pathfinder hardsuit control module" - desc = "A Commonwealth pathfinder hardsuit is hard to come by... how'd this end up on the frontier?" + name = "\improper Solgov pathfinder hardsuit control module" + desc = "A Solgov pathfinder hardsuit is hard to come by... how'd this end up on the frontier?" icon = 'icons/obj/rig_modules_vr.dmi' // the item default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm index dfd4c2babf..9b5287538b 100644 --- a/code/modules/clothing/spacesuits/void/station_vr.dm +++ b/code/modules/clothing/spacesuits/void/station_vr.dm @@ -49,8 +49,9 @@ ) // Alt mining voidsuit +// CHOMPStation Edit Start: Commonwealth -> Solgov. /obj/item/clothing/suit/space/void/mining/alt2 - desc = "A surplus Commonwealth mining voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov mining voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -61,7 +62,7 @@ slowdown = 0 /obj/item/clothing/head/helmet/space/void/mining/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -72,7 +73,7 @@ // Alt anomaly/excavation suit /obj/item/clothing/suit/space/anomaly/alt - desc = "A surplus Commonwealth anomaly suit! Slightly more comfortable and easier to move in than your average anomaly suit." + desc = "A surplus Solgov anomaly suit! Slightly more comfortable and easier to move in than your average anomaly suit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -83,7 +84,7 @@ slowdown = 0.5 /obj/item/clothing/head/helmet/space/anomaly/alt - desc = "A surplus Commonwealth helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -94,7 +95,7 @@ // Alt riot suit /obj/item/clothing/suit/space/void/security/riot/alt - desc = "A surplus Commonwealth riot control voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov riot control voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -105,7 +106,7 @@ slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/security/riot/alt - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -116,7 +117,7 @@ // Alt pilot suit /obj/item/clothing/suit/space/void/pilot/alt2 - desc = "A surplus Commonwealth pilot voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov pilot voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -127,7 +128,7 @@ slowdown = 0 /obj/item/clothing/head/helmet/space/void/pilot/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -138,7 +139,7 @@ // Alt medical/emt suit /obj/item/clothing/suit/space/void/medical/alt2 - desc = "A surplus Commonwealth medical voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov medical voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -149,7 +150,7 @@ slowdown = 0 /obj/item/clothing/head/helmet/space/void/medical/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -160,7 +161,7 @@ // Alt explorer suit /obj/item/clothing/suit/space/void/exploration/alt2 - desc = "A surplus Commonwealth exploration voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov exploration voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -171,7 +172,7 @@ slowdown = 0 /obj/item/clothing/head/helmet/space/void/exploration/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -182,7 +183,7 @@ // Alt engineering voidsuit /obj/item/clothing/suit/space/void/engineering/alt2 - desc = "A surplus Commonwealth engineering voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov engineering voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -193,7 +194,7 @@ slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/engineering/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -204,7 +205,7 @@ // Alt atmos voidsuit /obj/item/clothing/suit/space/void/atmos/alt2 - desc = "A surplus Commonwealth atmospherics voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov atmospherics voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -215,7 +216,7 @@ slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/atmos/alt2 - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -226,7 +227,7 @@ // Alt command voidsuit /obj/item/clothing/suit/space/void/captain/alt - desc = "A surplus Commonwealth Navy captain voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." + desc = "A surplus Solgov Navy captain voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' @@ -237,7 +238,7 @@ slowdown = 1.0 /obj/item/clothing/head/helmet/space/void/captain/alt - desc = "A surplus Commonwealth voidsuit helmet. Seems more fancy than what's usually found on the frontier." + desc = "A surplus Solgov voidsuit helmet. Seems more fancy than what's usually found on the frontier." icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' @@ -245,3 +246,5 @@ item_state = null sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + +// CHOMPStation Edit End