cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Void Undersuit Tweaks (#8339)

Browse Source 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-05-12 07:16:45 -07:00
committed by GitHub
parent 84738f0c62
commit 2bc9a42747
7 changed files with 111 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
View File

@@ -157,6 +157,27 @@
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/undersuit
display_name = "Civilian - Void Undersuits"
description = "Select from a range of void undersuits. Each is breathable, sleek, and has standard induction ports. Security, Engineering, and Command variants can be found under the standard uniform selectors for those departments."
path = /obj/item/clothing/under/undersuit/
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/undersuit/New()
..()
var/list/suits = list()
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec,
/obj/item/clothing/under/undersuit/sec/hos,
/obj/item/clothing/under/undersuit/hazard,
/obj/item/clothing/under/undersuit/command,
/obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit))
if(undersuit_type in blacklisted_types)
continue
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
//Security
/datum/gear/uniform/security_selector

19
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -123,25 +123,6 @@ Talon jumpsuit
)
gear_tweaks += new/datum/gear_tweak/path(dresses)
// undersuits
/datum/gear/uniform/undersuit
display_name = "undersuit selection"
path = /obj/item/clothing/under/undersuit/
/datum/gear/uniform/undersuit/New()
..()
var/list/suits = list()
var/list/blacklisted_types = list(/obj/item/clothing/under/undersuit/sec,
/obj/item/clothing/under/undersuit/sec/hos,
/obj/item/clothing/under/undersuit/hazard,
/obj/item/clothing/under/undersuit/command,
/obj/item/clothing/under/undersuit/centcom)
for(var/obj/item/clothing/under/undersuit/undersuit_type as anything in typesof(/obj/item/clothing/under/undersuit))
if(undersuit_type in blacklisted_types)
continue
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
//Altevian Uniforms
/datum/gear/uniform/altevian
description = "A comfortable set of clothing for people to handle their day to day work around the fleets with little to no discomfort."

89
code/modules/clothing/under/eva_bodysuits.dm Normal file
View File

@@ -0,0 +1,89 @@
/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it
name = "undersuit"
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_state = "bodysuit"
item_state = "bodysuit"
rolled_sleeves = -1
rolled_down_icon_override = FALSE
/obj/item/clothing/under/undersuit/eva
name = "EVA undersuit"
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for EVA usage, but differs little from the standard."
icon_state = "bodysuit_eva"
item_state = "bodysuit_eva"
/obj/item/clothing/under/undersuit/command
name = "command undersuit"
desc = "A fancy undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Command, and comes with a swanky gold trim and navy blue inlay."
icon_state = "bodysuit_com"
item_state = "bodysuit_com"
/obj/item/clothing/under/undersuit/sec
name = "security undersuit"
desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Security, and has slight protective capabilities against simple melee attacks."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
icon_state = "bodysuit_sec"
item_state = "bodysuit_sec"
/obj/item/clothing/under/undersuit/sec/hos
name = "security command undersuit"
desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the Head of Security or equivalent, and has slight protective capabilities against simple melee attacks."
icon_state = "bodysuit_seccom"
item_state = "bodysuit_seccom"
/obj/item/clothing/under/undersuit/hazard
name = "hazard undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Engineering crew, and comes with slight radiation absorption capabilities. Not a lot, but it's there."
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
icon_state = "bodysuit_haz"
item_state = "bodysuit_haz"
/obj/item/clothing/under/undersuit/mining
name = "mining undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Mining crew, and comes with an interestingly colored trim."
icon_state = "bodysuit_min"
item_state = "bodysuit_min"
/obj/item/clothing/under/undersuit/emt
name = "medical technician undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Medical response crew, and comes with a distinctive coloring scheme."
icon_state = "bodysuit_emt"
item_state = "bodysuit_emt"
/obj/item/clothing/under/undersuit/explo
name = "exploration undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Exploration crew, for hazardous environments."
icon_state = "bodysuit_exp"
item_state = "bodysuit_exp"
/obj/item/clothing/under/undersuit/centcom
name = "Central Command undersuit"
desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings."
icon_state = "bodysuit_cent"
item_state = "bodysuit_cent"
/obj/item/clothing/under/undersuit/alt
name = "alternate undersuit"
desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
icon_state = "altbodysuit"
item_state = "altbodysuit"
/obj/item/clothing/under/undersuit/alt/sleeveless
name = "alternate undersuit, sleeveless"
desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
item_state = "altbodysuit_sleeveless"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/undersuit/alt/fem
name = "alternate undersuit, feminine"
desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
item_state = "altbodysuitfem"
/obj/item/clothing/under/undersuit/alt/sleeveless/fem
name = "alternate undersuit, feminine sleeveless"
desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
item_state = "altbodysuitfem_sleeveless"

69
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -326,75 +326,6 @@
rolled_down = -1
body_parts_covered = UPPER_TORSO // frankly this thing's a fucking embarassment
/obj/item/clothing/under/undersuit // undersuits! intended for wearing under hardsuits or for being too lazy to not wear anything other than it
name = "undersuit"
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. Breathable, yet sleek."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi'
icon_state = "bodysuit"
item_state = "bodysuit"
rolled_sleeves = -1
rolled_down_icon_override = FALSE
/obj/item/clothing/under/undersuit/eva
name = "EVA undersuit"
desc = "A nondescript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for EVA usage, but differs little from the standard."
icon_state = "bodysuit_eva"
item_state = "bodysuit_eva"
/obj/item/clothing/under/undersuit/command
name = "command undersuit"
desc = "A fancy undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Command, and comes with a swanky gold trim and navy blue inlay."
icon_state = "bodysuit_com"
item_state = "bodysuit_com"
/obj/item/clothing/under/undersuit/sec
name = "security undersuit"
desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for those in Security, and has slight protective capabilities against simple melee attacks."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
icon_state = "bodysuit_sec"
item_state = "bodysuit_sec"
/obj/item/clothing/under/undersuit/sec/hos
name = "security command undersuit"
desc = "A reinforced undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for the Head of Security or equivalent, and has slight protective capabilities against simple melee attacks."
icon_state = "bodysuit_seccom"
item_state = "bodysuit_seccom"
/obj/item/clothing/under/undersuit/hazard
name = "hazard undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Engineering crew, and comes with slight radiation absorption capabilities. Not a lot, but it's there."
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
icon_state = "bodysuit_haz"
item_state = "bodysuit_haz"
/obj/item/clothing/under/undersuit/mining
name = "mining undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Mining crew, and comes with an interestingly colored trim."
icon_state = "bodysuit_min"
item_state = "bodysuit_min"
/obj/item/clothing/under/undersuit/emt
name = "medical technician undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Medical response crew, and comes with a distinctive coloring scheme."
icon_state = "bodysuit_emt"
item_state = "bodysuit_emt"
/obj/item/clothing/under/undersuit/explo
name = "exploration undersuit"
desc = "An undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for Exploration crew, for hazardous environments."
icon_state = "bodysuit_exp"
item_state = "bodysuit_exp"
/obj/item/clothing/under/undersuit/centcom
name = "Central Command undersuit"
desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings."
icon_state = "bodysuit_cent"
item_state = "bodysuit_cent"
//FEMININE JUMPSUITS.
/obj/item/clothing/under/color/fjumpsuit //They won't see this so we can make it whatever we want.
name = "blue feminine jumpsuit"

BIN
icons/inventory/uniform/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
icons/inventory/uniform/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 114 KiB

1
vorestation.dme
View File

@@ -2323,6 +2323,7 @@
#include "code\modules\clothing\suits\aliens\vox.dm"
#include "code\modules\clothing\under\altevian_vr.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\eva_bodysuits.dm"
#include "code\modules\clothing\under\extrauniforms_yw.dm"
#include "code\modules\clothing\under\imperial_vr.dm"
#include "code\modules\clothing\under\miscellaneous.dm"