cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworks bluespace suit, adds redspace suit

Browse Source
This commit is contained in:
Heroman
2021-03-07 14:08:25 +10:00
parent 0f079e1fe9
commit ecb982e6e9
7 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+7
View File
@@ -204,3 +204,10 @@ Qipao
/datum/gear/uniform/qipao_white
display_name = "qipao, white"
path = /obj/item/clothing/under/dress/qipao/white
/*
Bluespace jumpsuit
*/
/datum/gear/uniform/bsjumpsuit
display_name = "bluespace jumpsuit"
path = /obj/item/clothing/under/bluespace
code/modules/clothing/under/miscellaneous_vr.dm
+24 -19
View File
@@ -18,24 +18,23 @@
/obj/item/clothing/under/bluespace
name = "bluespace jumpsuit"
icon_state = "lingchameleon"
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bluespace"
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 = "bluespace"
worn_state = "bluespace"
desc = "Got a lot to hide on your body? Well, this 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()
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 bluespace 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)
@@ -44,23 +43,29 @@
/obj/item/clothing/under/bluespace/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/bluespace/redspace
name = "redspace jumpsuit"
icon_state = "redspace"
item_state = "redspace"
worn_state = "redspace"
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/bluespace/redspace/verb/resize()
set name = "Adjust Redspace Fibers"
set desc = "Adjust your suit's redspace 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/bluespace/redspace/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/bluespace/redspace/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
+13 -5
View File
@@ -1,9 +1,17 @@
/datum/design/item/general/bluespace_jumpsuit
name = "Bluespace jumpsuit"
name = "RBluespace jumpsuit"
id = "bsjumpsuit"
req_tech = list(TECH_BLUESPACE = 2)
materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/clothing/under/bluespace
sort_string = "TAVAA"
/datum/design/item/general/redspace_jumpsuit
name = "Redspace jumpsuit"
id = "rsjumpsuit"
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/bluespace/redspace
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
+2 -2
View File
@@ -307,13 +307,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 ..()