diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index d2772caa4bd..297e514e0d4 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -180,6 +180,7 @@ prob(2);/obj/item/clothing/shoes/galoshes, prob(2);/obj/item/clothing/under/pants/camo, prob(2);/obj/item/clothing/under/syndicate/tacticool, + prob(2);/obj/item/clothing/under/hyperfiber, prob(2);/obj/item/device/camera, prob(2);/obj/item/device/flashlight/flare, prob(2);/obj/item/device/flashlight/glowstick, @@ -240,6 +241,7 @@ prob(2);/obj/item/weapon/handcuffs/legcuffs/fuzzy, prob(2);/obj/item/weapon/storage/box/syndie_kit/spy, prob(2);/obj/item/weapon/grenade/anti_photon, + prob(2);/obj/item/clothing/under/hyperfiber/bluespace, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/device/nif/bad, prob(1);/obj/item/device/radio_jammer, diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index d953334b7eb..6c8fc917641 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -204,3 +204,11 @@ Qipao /datum/gear/uniform/qipao_white display_name = "qipao, white" path = /obj/item/clothing/under/dress/qipao/white + +/* +Bluespace jumpsuit +*/ +/datum/gear/uniform/hfjumpsuit + display_name = "HYPER jumpsuit" + path = /obj/item/clothing/under/hyperfiber + cost = 2 \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 61a21c25d6a..762ea621095 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -16,51 +16,56 @@ item_state = "golem" //This is dumb and hacky but was here when I got here. worn_state = "golem" //It's basically just a coincidentally black iconstate in the file. -/obj/item/clothing/under/bluespace - name = "bluespace jumpsuit" - icon_state = "lingchameleon" +/obj/item/clothing/under/hyperfiber + name = "HYPER jumpsuit" + icon = 'icons/obj/clothing/uniforms_vr.dmi' + icon_override = 'icons/mob/uniform_vr.dmi' + icon_state = "hyper" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi', slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi', ) - item_state = "lingchameleon" - worn_state = "lingchameleon" - desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \ - Allows one to resize themselves at will, and conceals their true weight." + item_state = "hyper" + worn_state = "hyper" + desc = "Got a lot to hide on your body? Well, this Heavy Yield Protrusion Erasing and Retracting suit seems perfect for you. \ + Hides any bulges on your body, as well as conceals your true weight." hides_bulges = TRUE - var/original_size - - -/obj/item/clothing/under/bluespace/verb/toggle_fibers() +/obj/item/clothing/under/hyperfiber/verb/toggle_fibers() set category = "Object" - set name = "Adjust fibers" - set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not." + set name = "Adjust Bluespace Fibers" + set desc = "Adjust your suit's HYPER fibers. Activating it hides your stomach(s) and your general body-build. Good if you have a lot to hide." set src in usr adjust_fibers(usr) ..() -/obj/item/clothing/under/bluespace/proc/adjust_fibers(mob/user) +/obj/item/clothing/under/hyperfiber/proc/adjust_fibers(mob/user) if(hides_bulges == FALSE) hides_bulges = TRUE - to_chat(user, "You tense the suit fibers, hiding your stomach(s).") + to_chat(user, "You tense the suit fibers, hiding your stomach(s) and weight.") else hides_bulges = FALSE - to_chat(user, "You relax the suit fibers, showing your stomach(s).") + to_chat(user, "You relax the suit fibers, revealing your stomach(s) and weight.") +/obj/item/clothing/under/hyperfiber/bluespace + name = "bluespace jumpsuit" + icon_state = "bluespace" + item_state = "bluespace" + worn_state = "bluespace" + desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \ + Allows one to resize themselves at will, and conceals their true weight as well as any bulges or protrusions on their body." + var/original_size - -/obj/item/clothing/under/bluespace/verb/resize() - set name = "Adjust Size" +/obj/item/clothing/under/hyperfiber/bluespace/verb/resize() + set name = "Adjust Bluespace Fibers" + set desc = "Adjust your suit's bluespace fibers. Activating it allows you to expand your own body or reduce it in size! Effect is limited to when you have the suit on." set category = "Object" set src in usr bluespace_size(usr) ..() - - -/obj/item/clothing/under/bluespace/proc/bluespace_size(mob/usr as mob) +/obj/item/clothing/under/hyperfiber/bluespace/proc/bluespace_size(mob/usr as mob) if (!ishuman(usr)) return @@ -102,7 +107,7 @@ else //They chose their current size. return -/obj/item/clothing/under/bluespace/mob_can_unequip(mob/M, slot, disable_warning = 0) +/obj/item/clothing/under/hyperfiber/bluespace/mob_can_unequip(mob/M, slot, disable_warning = 0) . = ..() if(. && ishuman(M) && original_size) var/mob/living/carbon/human/H = M diff --git a/code/modules/research/designs/misc_vr.dm b/code/modules/research/designs/misc_vr.dm index d26f24ed59d..5d8bcc2d813 100644 --- a/code/modules/research/designs/misc_vr.dm +++ b/code/modules/research/designs/misc_vr.dm @@ -1,9 +1,17 @@ +/datum/design/item/general/hyperfiber_jumpsuit + name = "HYPER jumpsuit" + id = "hfjumpsuit" + req_tech = list(TECH_BLUESPACE = 2) + materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_GLASS = 1000) + build_path = /obj/item/clothing/under/hyperfiber + sort_string = "TAVAA" + /datum/design/item/general/bluespace_jumpsuit name = "Bluespace jumpsuit" id = "bsjumpsuit" req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_GLASS = 4000) - build_path = /obj/item/clothing/under/bluespace + build_path = /obj/item/clothing/under/hyperfiber/bluespace sort_string = "TAVAA" /datum/design/item/general/sizegun @@ -12,7 +20,7 @@ req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000) build_path = /obj/item/weapon/gun/energy/sizegun - sort_string = "TAVAB" + sort_string = "TAVBA" /datum/design/item/general/bodysnatcher name = "Body Snatcher" @@ -28,7 +36,7 @@ req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 5, TECH_POWER = 6) materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000) build_path = /obj/item/weapon/inducer/sci - sort_string = "TAVAB" + sort_string = "TCVAA" /datum/design/item/general/inducer_eng name = "Inducer (Industrial)" @@ -36,4 +44,4 @@ req_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7, TECH_POWER = 7) materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000) build_path = /obj/item/weapon/inducer/unloaded - sort_string = "TAVAC" + sort_string = "TCVAB" diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index ab89e773cd3..e837e08cc44 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -311,13 +311,13 @@ //A uniform could hide it. if(istype(w_uniform,/obj/item/clothing)) var/obj/item/clothing/under = w_uniform - if(under.hides_bulges) + if(istype(under) && under.hides_bulges) return FALSE //We return as soon as we find one, no need for 'else' really. if(istype(wear_suit,/obj/item/clothing)) var/obj/item/clothing/suit = wear_suit - if(suit.hides_bulges) + if(istype(suit) && suit.hides_bulges) return FALSE return ..() diff --git a/icons/mob/uniform_vr.dmi b/icons/mob/uniform_vr.dmi index 463e0dc201a..7be0960b798 100644 Binary files a/icons/mob/uniform_vr.dmi and b/icons/mob/uniform_vr.dmi differ diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/obj/clothing/uniforms_vr.dmi index c399246a0bb..793a6004b30 100644 Binary files a/icons/obj/clothing/uniforms_vr.dmi and b/icons/obj/clothing/uniforms_vr.dmi differ