diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index d396eb77dec..417abf1ae17 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -143,31 +143,32 @@ access = access_medical_equip /datum/supply_pack/voidsuits/medical/alt - name = "Vey-Med Autoadaptive voidsuits (humanoid)" - desc = "A pair of advanced Vey-Med Adaptive Medical voidsuits. Requires Medical access, fits most humanoids." + name = "Vey-Med Autoadaptive Lightweight voidsuits" + desc = "A pair of advanced Vey-Med Auto-adaptive Medical voidsuits. Autofits most humanoids without need for cycling. Requires Medical Equipment access." contains = list( - /obj/item/clothing/suit/space/void/medical/alt = 2, - /obj/item/clothing/head/helmet/space/void/medical/alt = 2, + /obj/item/clothing/suit/space/void/medical/veymed = 2, + /obj/item/clothing/head/helmet/space/void/medical/veymed = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/veymed - containername = "Vey-Med Autoadaptive voidsuit (humanoid) crate" + containername = "Vey-Med Autoadaptive Lightweight voidsuit crate" access = access_medical_equip -/datum/supply_pack/voidsuits/medical/alt/tesh - name = "Vey-Med Autoadaptive voidsuits (teshari)" - desc = "A pair of advanced Vey-Med Adaptive Medical voidsuits. Requires Medical access, fits teshari only." +/datum/supply_pack/voidsuits/medical/alt/static + name = "Vey-Med Nonadaptive Lightweight voidsuits" + desc = "A pair of advanced Vey-Med Adaptive Medical voidsuits. The autoadaptive feature has been removed to reduce costs. Requires Medical Equipment access." contains = list( - /obj/item/clothing/suit/space/void/medical/alt/tesh = 2, - /obj/item/clothing/head/helmet/space/void/medical/alt/tesh = 2, + /obj/item/clothing/suit/space/void/medical/veymed_static = 2, + /obj/item/clothing/head/helmet/space/void/medical/veymed_static = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, /obj/item/tank/oxygen = 2 ) - containername = "Vey-Med Autoadaptive voidsuit (teshari) crate" + cost = 50 + containername = "Vey-Med Nonadaptive Lightweight voidsuit crate" /datum/supply_pack/voidsuits/security name = "Security voidsuits" diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index f26860c9248..62947d03ae9 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -788,8 +788,8 @@ var/list/dispenser_presets = list() "helmet" = /obj/item/clothing/head/helmet/space/void/medical ), prob(5);list( - "suit" = /obj/item/clothing/suit/space/void/medical/alt, - "helmet" = /obj/item/clothing/head/helmet/space/void/medical/alt + "suit" = /obj/item/clothing/suit/space/void/medical/veymed, + "helmet" = /obj/item/clothing/head/helmet/space/void/medical/veymed ), prob(5);list( "suit" = /obj/item/clothing/suit/space/void/medical/bio, diff --git a/code/game/machinery/suit_storage/suit_cycler_datums.dm b/code/game/machinery/suit_storage/suit_cycler_datums.dm index 88e10f79ddb..15a90436ad2 100644 --- a/code/game/machinery/suit_storage/suit_cycler_datums.dm +++ b/code/game/machinery/suit_storage/suit_cycler_datums.dm @@ -113,9 +113,9 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) helmet_becomes = /obj/item/clothing/head/helmet/space/void/medical suit_becomes = /obj/item/clothing/suit/space/void/medical /datum/suit_cycler_choice/department/med/streamlined - 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 + name = "Vey-Medical Lightweight" + helmet_becomes = /obj/item/clothing/head/helmet/space/void/medical/veymed_static + suit_becomes = /obj/item/clothing/suit/space/void/medical/veymed_static /datum/suit_cycler_choice/department/med/commonwealth name = "Commonwealth Medical" helmet_becomes = /obj/item/clothing/head/helmet/space/void/medical/alt2 diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm index 417f03ec3d7..b75afbc20d4 100644 --- a/code/game/objects/random/spacesuits.dm +++ b/code/game/objects/random/spacesuits.dm @@ -46,8 +46,8 @@ /obj/item/clothing/head/helmet/space/void/medical ), prob(5);list( - /obj/item/clothing/suit/space/void/medical/alt, - /obj/item/clothing/head/helmet/space/void/medical/alt + /obj/item/clothing/suit/space/void/medical/veymed, + /obj/item/clothing/head/helmet/space/void/medical/veymed ), prob(5);list( /obj/item/clothing/suit/space/void/medical/bio, @@ -178,8 +178,8 @@ /obj/item/clothing/head/helmet/space/void/medical ), prob(1);list( - /obj/item/clothing/suit/space/void/medical/alt, - /obj/item/clothing/head/helmet/space/void/medical/alt + /obj/item/clothing/suit/space/void/medical/veymed, + /obj/item/clothing/head/helmet/space/void/medical/veymed ), prob(3);list( /obj/item/clothing/suit/space/void/medical/bio, @@ -227,7 +227,7 @@ /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot ), - + prob(10);list( /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 953cba8b99e..81ff8e89625 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -196,77 +196,37 @@ slowdown = 1.5 //Medical Streamlined Voidsuit -/obj/item/clothing/head/helmet/space/void/medical/alt - name = "streamlined medical voidsuit helmet" +/obj/item/clothing/head/helmet/space/void/medical/veymed + name = "lightweight medical voidsuit helmet" desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a sleek blue. It possesses advanced autoadaptive systems and doesn't need to be cycled to change species fit for most large humanoids." icon_state = "rig0-medicalalt" armor = list(melee = 20, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 30) light_overlay = "helmet_light_dual_blue" - species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt to most species, but diona/vox are too weird, and tesh are too small + species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt to most species, but diona/vox are too weird no_cycle = TRUE -/obj/item/clothing/head/helmet/space/void/medical/alt - sprite_sheets = list( - SPECIES_HUMAN = 'icons/inventory/head/mob.dmi', - SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TAJARAN = 'icons/inventory/head/item.dmi', - SPECIES_SKRELL = 'icons/inventory/head/item.dmi', - SPECIES_UNATHI = 'icons/inventory/head/item.dmi' - ) - -/obj/item/clothing/head/helmet/space/void/medical/alt/tesh - name = "streamlined teshari medical voidsuit helmet" - desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a sleek blue. This teshari-specific model lacks the autoadaption feature due to the reduced amount of materials." - species_restricted = list(SPECIES_TESHARI) - no_cycle = FALSE //no autoadaption means it can be refitted - -/obj/item/clothing/head/helmet/space/void/medical/alt/tesh - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TESHARI = 'icons/inventory/head/item.dmi' - ) - -/obj/item/clothing/suit/space/void/medical/alt - name = "streamlined medical voidsuit" +/obj/item/clothing/suit/space/void/medical/veymed + name = "lightweight medical voidsuit" desc = "A more recent model of Vey-Med voidsuit, exchanging physical protection for fully unencumbered movement and a complete range of motion. It possesses advanced autoadaptive systems and doesn't need to be cycled to change species fit for most large humanoids." icon_state = "rig-medicalalt" slowdown = 0 armor = list(melee = 20, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 30) - species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt, but diona/vox are too weird, and tesh are too small + species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt, but diona/vox are too weird no_cycle = TRUE -/obj/item/clothing/suit/space/void/medical/alt - sprite_sheets = list( - SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi', - SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TAJARAN = 'icons/inventory/suit/item.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/item.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/item.dmi' - ) +/obj/item/clothing/head/helmet/space/void/medical/veymed_static + name = "nonadaptive lightweight medical voidsuit helmet" + desc = "A trendy, lightly radiation-shielded voidsuit helmet trimmed in a sleek blue. This specific model lacks the autoadaption feature as a cost-saving measure." + icon_state = "rig0-medicalalt" + armor = list(melee = 20, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 30) + light_overlay = "helmet_light_dual_blue" -/obj/item/clothing/suit/space/void/medical/alt/tesh - name = "streamlined teshari medical voidsuit" - desc = "A more recent model of Vey-Med voidsuit, exchanging physical protection for fully unencumbered movement and a complete range of motion. This teshari-specific model lacks the autoadaption feature due to the reduced amount of materials." - species_restricted = list(SPECIES_TESHARI) - no_cycle = FALSE //no autoadaption means it can be refitted - -/obj/item/clothing/suit/space/void/medical/alt/tesh - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TESHARI = 'icons/inventory/suit/item.dmi' - ) +/obj/item/clothing/suit/space/void/medical/veymed_static + name = "nonadaptive lightweight medical voidsuit" + desc = "A more recent model of Vey-Med voidsuit, exchanging physical protection for fully unencumbered movement and a complete range of motion. This specific model lacks the autoadaption feature as a cost-saving measure." + icon_state = "rig-medicalalt" + slowdown = 0 + armor = list(melee = 20, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 30) //Security /obj/item/clothing/head/helmet/space/void/security diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm index f6db1076746..5a6240b4dc6 100644 --- a/code/modules/clothing/spacesuits/void/station_vr.dm +++ b/code/modules/clothing/spacesuits/void/station_vr.dm @@ -1,53 +1,3 @@ -/obj/item/clothing/head/helmet/space/void/medical/alt - sprite_sheets = list( - SPECIES_HUMAN = 'icons/inventory/head/mob.dmi', - SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/head/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_SERGAL = 'icons/inventory/head/mob_unathi.dmi', - SPECIES_VULPKANIN = 'icons/inventory/head/mob_vr_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/head/mob_vr_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/head/mob_vr_vulpkanin.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TAJARAN = 'icons/inventory/head/item.dmi', - SPECIES_SKRELL = 'icons/inventory/head/item.dmi', - SPECIES_UNATHI = 'icons/inventory/head/item.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/head/item.dmi', - SPECIES_AKULA = 'icons/inventory/head/item.dmi', - SPECIES_SERGAL = 'icons/inventory/head/item.dmi', - SPECIES_VULPKANIN = 'icons/inventory/head/item.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/head/item.dmi', - SPECIES_FENNEC = 'icons/inventory/head/item.dmi' - ) - -/obj/item/clothing/suit/space/void/medical/alt - sprite_sheets = list( - SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi', - SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/suit/mob_vr_akula.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_sergal.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi' - ) - sprite_sheets_obj = list( - SPECIES_TAJARAN = 'icons/inventory/suit/item.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/item.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/item.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/suit/item.dmi', - SPECIES_AKULA = 'icons/inventory/suit/item.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/item.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/item.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/item.dmi' - ) - // Alt mining voidsuit /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." diff --git a/icons/inventory/head/item_teshari.dmi b/icons/inventory/head/item_teshari.dmi index 2d7877c0c3e..5bc563f29e2 100644 Binary files a/icons/inventory/head/item_teshari.dmi and b/icons/inventory/head/item_teshari.dmi differ diff --git a/icons/inventory/head/mob_vr_akula.dmi b/icons/inventory/head/mob_vr_akula.dmi index 18f39e67363..c56650077c0 100644 Binary files a/icons/inventory/head/mob_vr_akula.dmi and b/icons/inventory/head/mob_vr_akula.dmi differ diff --git a/icons/inventory/head/mob_vr_altevian.dmi b/icons/inventory/head/mob_vr_altevian.dmi index deb0367b6c3..6b0721663c2 100644 Binary files a/icons/inventory/head/mob_vr_altevian.dmi and b/icons/inventory/head/mob_vr_altevian.dmi differ diff --git a/icons/inventory/head/mob_vr_sergal.dmi b/icons/inventory/head/mob_vr_sergal.dmi index eb67a6dc5cd..0358f57fe6d 100644 Binary files a/icons/inventory/head/mob_vr_sergal.dmi and b/icons/inventory/head/mob_vr_sergal.dmi differ diff --git a/icons/inventory/suit/item_teshari.dmi b/icons/inventory/suit/item_teshari.dmi index cdefe68ca5b..0ae66e6191e 100644 Binary files a/icons/inventory/suit/item_teshari.dmi and b/icons/inventory/suit/item_teshari.dmi differ diff --git a/icons/inventory/suit/mob_vr_altevian.dmi b/icons/inventory/suit/mob_vr_altevian.dmi index 54e3236cfdf..a13c1913a8f 100644 Binary files a/icons/inventory/suit/mob_vr_altevian.dmi and b/icons/inventory/suit/mob_vr_altevian.dmi differ diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 95ee0d28fa9..40c681d509d 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -4654,8 +4654,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/clothing/suit/space/void/medical/alt, -/obj/item/clothing/head/helmet/space/void/medical/alt, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "FA" = (