Merge pull request #9865 from Heroman3003/sizespace-suit

Adds HYPER suit

code/game/objects/structures/trash_pile_vr.dm

@@ -181,6 +181,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,
@@ -242,6 +243,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,

code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm

@@ -216,3 +216,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

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
+/obj/item/clothing/under/hyperfiber
-	name = "bluespace jumpsuit"
+	name = "HYPER jumpsuit"
-	icon_state = "lingchameleon"
+	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"
+	item_state = "hyper"
-	worn_state = "lingchameleon"
+	worn_state = "hyper"
-	desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \
+	desc = "Got a lot to hide on your body? Well, this Heavy Yield Protrusion Erasing and Retracting suit seems perfect for you. \
-			Allows one to resize themselves at will, and conceals their true weight."
+			Hides any bulges on your body, as well as conceals your true weight."
 	hides_bulges = TRUE
-	var/original_size
 
-
+/obj/item/clothing/under/hyperfiber/verb/toggle_fibers()
-
-/obj/item/clothing/under/bluespace/verb/toggle_fibers()
 		set category = "Object"
-		set name = "Adjust fibers"
+		set name = "Adjust Bluespace Fibers"
-		set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not."
+		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/hyperfiber/bluespace/verb/resize()
-/obj/item/clothing/under/bluespace/verb/resize()
+	set name = "Adjust Bluespace Fibers"
-	set name = "Adjust Size"
+	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/hyperfiber/bluespace/proc/bluespace_size(mob/usr as mob)
-
-/obj/item/clothing/under/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

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"

code/modules/vore/eating/living_vr.dm

@@ -325,13 +325,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 ..()