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] No more fake hoods (#10421)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-15 14:54:07 -07:00
committed by GitHub
parent fedfb92bd7
commit f08d4c2cd0
11 changed files with 409 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/gear_dispenser.dm
View File

@@ -85,7 +85,7 @@ var/list/dispenser_presets = list()
// If we're supposed to make a helmet
if(voidhelmet_type)
// The coder may not have realized this type spawns its own helmet
if(voidsuit.helmet)
if(voidsuit.hood)
error("[src] created a voidsuit [voidsuit] and wants to add a helmet but it already has one")
else
voidhelmet = new voidhelmet_type()

10
code/game/machinery/suit_storage/suit_cycler.dm
View File

@@ -204,7 +204,6 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
to_chat(user, "You cannot refit a customised voidsuit.")
return
//VOREStation Edit BEGINS
//Make it so autolok suits can't be refitted in a cycler
if(istype(I,/obj/item/clothing/head/helmet/space/void/autolok))
to_chat(user, "You cannot refit an autolok helmet. In fact you shouldn't even be able to remove it in the first place. Inform an admin!")
@@ -214,7 +213,6 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
if(istype(I,/obj/item/clothing/head/helmet/space/void/responseteam))
to_chat(user, "The cycler indicates that the Mark VII Emergency Response Helmet is not compatible with the refitting system. How did you manage to detach it anyway? Inform an admin!")
return
//VOREStation Edit ENDS
to_chat(user, "You fit \the [I] into the suit cycler.")
user.drop_item()
@@ -536,12 +534,12 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
if(target_department.can_refit_suit(suit))
target_department.do_refit_suit(suit)
// Attached voidsuit helmet to new paint
if(target_department.can_refit_helmet(suit?.helmet))
target_department.do_refit_helmet(suit.helmet)
if(target_department.can_refit_helmet(suit?.hood))
target_department.do_refit_helmet(suit.hood)
// Species fitting for all 3 potential changes
if(target_species.can_refit_to(helmet, suit, suit?.helmet))
target_species.do_refit_to(helmet, suit, suit?.helmet)
if(target_species.can_refit_to(helmet, suit, suit?.hood))
target_species.do_refit_to(helmet, suit, suit?.hood)
else
visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to apply specified cosmetics with specified species. Please try again with a different species or cosmetic option selected."))
return

82
code/modules/clothing/clothing.dm
View File

@@ -794,6 +794,16 @@
var/blood_overlay_type = "suit"
blood_sprite_state = "suitblood" //Defaults to the suit's blood overlay, so that some blood renders instead of no blood.
//Hood stuff. See hooded.dm for more info. This should be expanded so all suits can have hoods if desired.
//Currently only used by /obj/item/clothing/suit/storage/hooded.
var/obj/item/clothing/head/hood
var/hoodtype = null //so the chaplain hoodie or other hoodies can override this
var/hood_up = FALSE
var/has_hood_sprite = FALSE
var/special_hood_handling = FALSE
var/toggleicon
actions_types = list()
var/taurized = FALSE
siemens_coefficient = 0.9
w_class = ITEMSIZE_NORMAL
@@ -811,6 +821,78 @@
update_icon_define_digi = "icons/inventory/suit/mob_digi.dmi"
/obj/item/clothing/suit/Initialize(mapload)
MakeHood()
toggleicon = "[initial(icon_state)]"
. = ..()
/obj/item/clothing/suit/Destroy()
QDEL_NULL(hood)
return ..()
/obj/item/clothing/suit/update_icon()
. = ..()
if(has_hood_sprite) //If we have a special hood_sprite, great, let's use it! Only used by /obj/item/clothing/suit/storage/hooded atm.
icon_state = "[toggleicon][hood_up ? "_t" : ""]"
/obj/item/clothing/suit/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood()
..()
/obj/item/clothing/suit/dropped(mob/user)
RemoveHood()
..()
/obj/item/clothing/suit/ui_action_click(mob/user, actiontype)
if(..())
return TRUE
ToggleHood()
/// HOOD STUFF BELOW HERE.
/obj/item/clothing/suit/proc/MakeHood()
if(!hoodtype)
return
var/obj/item/clothing/head/hood/H = new hoodtype(src)
hood = H
if(!actions_types.len) //If we don't already have a special action type, let's add it.
actions_types |= /datum/action/item_action/toggle_hood
/obj/item/clothing/suit/proc/RemoveHood()
hood_up = FALSE
update_icon()
if(hood)
hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.forceMove(src)
/obj/item/clothing/suit/proc/ToggleHood()
if(!hood || special_hood_handling) //Some suits have special handling (See: void.dm with it's ui_action_click doing toggle_helmet())
return //In that case, we return and allow it to do it's special handling!
if(hood_up)
RemoveHood()
return
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
if(color != hood.color)
hood.color = color
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = TRUE
hood.canremove = FALSE
update_icon()
H.update_inv_wear_suit()
///Hood stuff end.
/obj/item/clothing/suit/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc

71
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -30,6 +30,7 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 10 * ONE_ATMOSPHERE
special_hood_handling = TRUE
actions_types = list(/datum/action/item_action/toggle_helmet)
species_restricted = list("Human", SPECIES_SKRELL, "Promethean")
sprite_sheets = VR_SPECIES_SPRITE_SHEETS_SUIT_MOB
@@ -42,7 +43,7 @@
//Inbuilt devices.
var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
var/obj/item/clothing/head/helmet/helmet = null // Deployable helmet, if any.
hood = null // Deployable helmet, if any.
var/obj/item/tank/tank = null // Deployable tank, if any.
var/obj/item/suit_cooling_unit/cooler = null// Cooling unit, for FBPs. Cannot be installed alongside a tank.
@@ -54,23 +55,23 @@
. = ..()
if(boots && ispath(boots))
boots = new boots(src)
if(helmet && ispath(helmet))
helmet = new helmet(src)
if(hood && ispath(hood))
hood = new hood(src)
if(tank && ispath(tank))
tank = new tank(src)
/obj/item/clothing/suit/space/void/examine(mob/user)
. = ..()
. += to_chat(user, span_notice("Alt-click to relase Tank/Cooling unit if installed."))
for(var/obj/item/I in list(helmet,boots,tank,cooler))
for(var/obj/item/I in list(hood,boots,tank,cooler))
. += "It has \a [I] installed."
if(tank && in_range(src,user))
. += span_notice("The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].")
/obj/item/clothing/suit/space/void/refit_for_species(var/target_species)
..()
if(istype(helmet))
helmet.refit_for_species(target_species)
if(istype(hood))
hood.refit_for_species(target_species)
if(istype(boots))
boots.refit_for_species(target_species)
@@ -88,12 +89,12 @@
if (H.equip_to_slot_if_possible(boots, slot_shoes))
boots.canremove = FALSE
if(helmet)
if(hood)
if(H.head)
to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.")
else if (H.equip_to_slot_if_possible(helmet, slot_head))
else if (H.equip_to_slot_if_possible(hood, slot_head))
to_chat(M, "Your suit's helmet deploys with a hiss.")
helmet.canremove = FALSE
hood.canremove = FALSE
if(tank)
if(H.s_store) //In case someone finds a way.
@@ -114,13 +115,13 @@
var/mob/living/carbon/human/H
if(helmet)
helmet.canremove = TRUE
H = helmet.loc
if(hood)
hood.canremove = TRUE
H = hood.loc
if(istype(H))
if(helmet && H.head == helmet)
H.drop_from_inventory(helmet)
helmet.forceMove(src)
if(hood && H.head == hood)
H.drop_from_inventory(hood)
hood.forceMove(src)
if(boots)
boots.canremove = TRUE
@@ -139,20 +140,20 @@
cooler.forceMove(src)
/obj/item/clothing/suit/space/void/proc/attach_helmet(var/obj/item/clothing/head/helmet/space/void/helm)
if(!istype(helm) || helmet)
if(!istype(helm) || hood)
return
helm.forceMove(src)
helm.set_light_flags(helm.light_flags | LIGHT_ATTACHED)
helmet = helm
hood = helm
/obj/item/clothing/suit/space/void/proc/remove_helmet()
if(!helmet)
if(!hood)
return
helmet.forceMove(get_turf(src))
helmet.set_light_flags(helmet.light_flags & ~LIGHT_ATTACHED)
helmet = null
hood.forceMove(get_turf(src))
hood.set_light_flags(hood.light_flags & ~LIGHT_ATTACHED)
hood = null
/obj/item/clothing/suit/space/void/ui_action_click(mob/living/user, action_name)
if(..())
@@ -167,7 +168,7 @@
if(!isliving(loc))
return
if(!helmet)
if(!hood)
to_chat(usr, "There is no helmet installed.")
return
@@ -177,22 +178,22 @@
if(H.stat) return
if(H.wear_suit != src) return
if(helmet.light_on)
if(hood.light_on)
to_chat(H, span_notice("The helmet light shuts off as it retracts."))
helmet.update_flashlight(H)
hood.update_flashlight(H)
if(H.head == helmet)
if(H.head == hood)
to_chat(H, span_notice("You retract your suit helmet."))
helmet.canremove = TRUE
H.drop_from_inventory(helmet)
helmet.forceMove(src)
hood.canremove = TRUE
H.drop_from_inventory(hood)
hood.forceMove(src)
playsound(src.loc, 'sound/machines/click2.ogg', 75, 1)
else
if(H.head)
to_chat(H, span_danger("You cannot deploy your helmet while wearing \the [H.head]."))
return
if(H.equip_to_slot_if_possible(helmet, slot_head))
helmet.canremove = FALSE
if(H.equip_to_slot_if_possible(hood, slot_head))
hood.canremove = FALSE
to_chat(H, span_info("You deploy your suit helmet, sealing you off from the world."))
playsound(src.loc, 'sound/machines/click2.ogg', 75, 1)
@@ -240,8 +241,8 @@
return
if(W.has_tool_quality(TOOL_SCREWDRIVER))
if(helmet || boots || tank)
var/choice = tgui_input_list(user, "What component would you like to remove?", "Remove Component", list(helmet,boots,tank,cooler))
if(hood || boots || tank)
var/choice = tgui_input_list(user, "What component would you like to remove?", "Remove Component", list(hood,boots,tank,cooler))
if(!choice) return
if(choice == tank) //No, a switch doesn't work here. Sorry. ~Techhead
@@ -254,8 +255,8 @@
cooler.forceMove(get_turf(src))
playsound(src, W.usesound, 50, 1)
src.cooler = null
else if(choice == helmet)
to_chat(user, "You detach \the [helmet] from \the [src]'s helmet mount.")
else if(choice == hood)
to_chat(user, "You detach \the [hood] from \the [src]'s helmet mount.")
remove_helmet()
playsound(src, W.usesound, 50, 1)
else if(choice == boots)
@@ -267,7 +268,7 @@
to_chat(user, "\The [src] does not have anything installed.")
return
else if(istype(W,/obj/item/clothing/head/helmet/space))
if(helmet)
if(hood)
to_chat(user, "\The [src] already has a helmet installed.")
else
to_chat(user, "You attach \the [W] to \the [src]'s helmet mount.")

2
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -99,7 +99,7 @@
/obj/item/clothing/suit/space/void/autolok/Initialize(mapload)
. = ..()
helmet = new /obj/item/clothing/head/helmet/space/void/autolok //autoinstall the helmet
hood = new /obj/item/clothing/head/helmet/space/void/autolok //autoinstall the helmet
//override the attackby screwdriver proc so that people can't remove the helmet
/obj/item/clothing/suit/space/void/autolok/attackby(obj/item/W, mob/user)

282
code/modules/clothing/spacesuits/void/zaddat.dm
View File

@@ -18,7 +18,7 @@
siemens_coefficient = 1
allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_ALL_TANKS)
icon_state = "zaddat_hegemony"
helmet = new/obj/item/clothing/head/helmet/space/void/zaddat //shrouds come with helmets built-in
hood = new/obj/item/clothing/head/helmet/space/void/zaddat //shrouds come with helmets built-in
var/has_been_customized = FALSE
species_restricted = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN)
@@ -45,77 +45,287 @@
desc = "This rugged Shroud was created by the Xozi Engineering Guild."
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
if(helmet)
helmet.name = "\improper Engineer's Guild Shroud helmet"
helmet.desc = "A Shroud helmet designed for good visibility in low-light environments."
helmet.icon_state = "zaddat_engie"
helmet.item_state = "zaddat_engie"
if(hood)
hood.name = "\improper Engineer's Guild Shroud helmet"
hood.desc = "A Shroud helmet designed for good visibility in low-light environments."
hood.icon_state = "zaddat_engie"
hood.item_state = "zaddat_engie"
if("Spacer")
name = "\improper Spacer's Guild Shroud"
base_name = "\improper Spacer's Guild Shroud"
desc = "The blue plastic Shroud worn by members of the Zaddat Spacer's Guild."
icon_state = "zaddat_spacer"
item_state = "zaddat_spacer"
if(helmet)
helmet.name = "\improper Spacer's Guild Shroud helmet"
helmet.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction."
helmet.icon_state = "zaddat_spacer"
helmet.item_state = "zaddat_spacer"
if(hood)
hood.name = "\improper Spacer's Guild Shroud helmet"
hood.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction."
hood.icon_state = "zaddat_spacer"
hood.item_state = "zaddat_spacer"
if("Knight")
name = "\improper Knight's Shroud"
base_name = "\improper Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild."
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
if(helmet)
helmet.name = "\improper Knight's Shroud helm"
helmet.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi."
helmet.icon_state = "zaddat_knight"
helmet.item_state = "zaddat_knight"
if(hood)
hood.name = "\improper Knight's Shroud helm"
hood.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi."
hood.icon_state = "zaddat_knight"
hood.item_state = "zaddat_knight"
if("Fashion")
name = "\improper Avazi House Shroud"
base_name = "\improper Avazi House Shroud"
desc = "The designers of the Avazi Fashion House are among the most renowned in Zaddat society, and their Shroud designs second to none."
icon_state = "zaddat_fashion"
item_state = "zaddat_fashion"
if(helmet)
helmet.name = "\improper Avazi House Shroud helmet"
helmet.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face."
helmet.icon_state = "zaddat_fashion"
helmet.item_state = "zaddat_fashion"
if(hood)
hood.name = "\improper Avazi House Shroud helmet"
hood.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face."
hood.icon_state = "zaddat_fashion"
hood.item_state = "zaddat_fashion"
if("Bishop")
name = "\improper Bishop-patterned Shroud"
base_name = "\improper Bishop-patterned Shroud"
desc = "The bold designers of the Dzaz Fashion House chose to make this Bishop-themed Shroud design as a commentary on the symbiotic nature of Vanax and human culture. Allegedly."
icon_state = "zaddat_bishop"
item_state = "zaddat_bishop"
if(helmet)
helmet.name = "\improper Bishop-patterned Shroud helmet"
helmet.desc = "The Shroud helmet that inspired a dozen lawsuits."
helmet.icon_state = "zaddat_bishop"
helmet.item_state = "zaddat_bishop"
if(hood)
hood.name = "\improper Bishop-patterned Shroud helmet"
hood.desc = "The Shroud helmet that inspired a dozen lawsuits."
hood.icon_state = "zaddat_bishop"
hood.item_state = "zaddat_bishop"
if("Rugged")
name = "rugged Shroud"
base_name = "rugged Shroud"
desc = "This Shroud was patterned after from First Contact era human voidsuits."
icon_state = "zaddat_rugged"
item_state = "zaddat_rugged"
if(helmet)
helmet.name = "rugged Shroud helmet"
helmet.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat."
helmet.icon_state = "zaddat_rugged"
helmet.item_state = "zaddat_rugged"
if(hood)
hood.name = "rugged Shroud helmet"
hood.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat."
hood.icon_state = "zaddat_rugged"
hood.item_state = "zaddat_rugged"
if("Soft")
name = "\improper soft Shroud"
base_name = "\improper soft Shroud"
desc = "Material and design is chosen for practical reasons, making it take as little space as possible when stowed whilst also providing reasonable comfort when worn for long periods."
icon_state = "zaddat_soft"
item_state = "zaddat_soft"
if(helmet)
helmet.name = "\improper soft Shroud hood"
helmet.desc = "Not as solid as a proper helmet, but works nonetheless."
helmet.icon_state = "zaddat_soft"
helmet.item_state = "zaddat_soft"
if(hood)
hood.name = "\improper soft Shroud hood"
hood.desc = "Not as solid as a proper helmet, but works nonetheless."
hood.icon_state = "zaddat_soft"
hood.item_state = "zaddat_soft"
to_chat(M, "You finish customizing your Shroud. Looking good!")
has_been_customized = TRUE
M.regenerate_icons()
return 1
//Zaddat subtypes
/obj/item/clothing/suit/space/void/zaddat/engineer
name = "\improper Engineer's Guild Shroud"
desc = "This rugged Shroud was created by the Xozi Engineering Guild."
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
hood = new/obj/item/clothing/head/helmet/space/void/zaddat/engineer
/obj/item/clothing/head/helmet/space/void/zaddat/engineer
name = "\improper Engineer's Guild Shroud helmet"
desc = "A Shroud helmet designed for good visibility in low-light environments."
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/suit/space/void/zaddat/security
name = "\improper Security Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild."
armor = list(melee = 30, bullet = 20, laser = 20,energy = 10, bomb = 10, bio = 100, rad = 30)
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
hood = new/obj/item/clothing/head/helmet/space/void/zaddat/security
/obj/item/clothing/head/helmet/space/void/zaddat/security
name = "\improper Security Knight's Shroud helm"
desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi."
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
armor = list(melee = 30, bullet = 20, laser = 20, energy = 10, bomb = 10, bio = 100, rad = 30)
/obj/item/clothing/suit/space/void/zaddat/security/custom_suit() //so it cant turn into looks that dont makes sense and keep security name in it
set name = "Customize Shroud"
set category = "Object"
set desc = "Pick an appearence for your Shroud."
var/mob/M = usr
var/suit_style = null
if(has_been_customized)
to_chat(M, "This Shroud has already been customized!")
return 0
suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft")
switch(suit_style)
if("Spacer")
name = "\improper Security Spacer's Guild Shroud"
base_name = "\improper Spacer's Guild Shroud"
desc = "The blue plastic Shroud worn by members of the Zaddat Spacer's Guild. This one has a layer of armor"
icon_state = "zaddat_spacer"
item_state = "zaddat_spacer"
if(hood)
hood.name = "\improper Security Spacer's Guild Shroud helmet"
hood.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction. This one has a layer of armor"
hood.icon_state = "zaddat_spacer"
hood.item_state = "zaddat_spacer"
if("Knight")
name = "\improper Security Knight's Shroud"
base_name = "\improper Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild. This one has a layer of armor"
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
if(hood)
hood.name = "\improper Security Knight's Shroud helm"
hood.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi. This one has a layer of armor"
hood.icon_state = "zaddat_knight"
hood.item_state = "zaddat_knight"
if("Fashion")
name = "\improper Security Avazi House Shroud"
base_name = "\improper Security Avazi House Shroud"
desc = "The designers of the Avazi Fashion House are among the most renowned in Zaddat society, and their Shroud designs second to none. This one has a layer of armor"
icon_state = "zaddat_fashion"
item_state = "zaddat_fashion"
if(hood)
hood.name = "\improper Security Avazi House Shroud helmet"
hood.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face. This one has a layer of armor"
hood.icon_state = "zaddat_fashion"
hood.item_state = "zaddat_fashion"
if("Bishop")
name = "\improper Security Bishop-patterned Shroud"
base_name = "\improper Bishop-patterned Shroud"
desc = "The bold designers of the Dzaz Fashion House chose to make this Bishop-themed Shroud design as a commentary on the symbiotic nature of Vanax and human culture. Allegedly. This one has a layer of armor"
icon_state = "zaddat_bishop"
item_state = "zaddat_bishop"
if(hood)
hood.name = "\improper Security Bishop-patterned Shroud helmet"
hood.desc = "The Shroud helmet that inspired a dozen lawsuits. This one has a layer of armor"
hood.icon_state = "zaddat_bishop"
hood.item_state = "zaddat_bishop"
if("Rugged")
name = "Security rugged Shroud"
base_name = "rugged Shroud"
desc = "This Shroud was patterned after from First Contact era human voidsuits. This one has a layer of armor"
icon_state = "zaddat_rugged"
item_state = "zaddat_rugged"
if(hood)
hood.name = "Security rugged Shroud helmet"
hood.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat. This one has a layer of armor"
hood.icon_state = "zaddat_rugged"
hood.item_state = "zaddat_rugged"
to_chat(M, "You finish customizing your Shroud. Looking good!")
has_been_customized = TRUE
M.regenerate_icons()
return 1
/obj/item/clothing/suit/space/void/zaddat/engineer/custom_suit()
set name = "Customize Shroud"
set category = "Object"
set desc = "Pick an appearence for your Shroud."
var/mob/M = usr
var/suit_style = null
if(has_been_customized)
to_chat(M, "This Shroud has already been customized!")
return 0
suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft")
switch(suit_style)
if("Engineer")
name = "\improper Rad-Plated Engineer's Guild Shroud"
base_name = "\improper Engineer's Guild Shroud"
desc = "This rugged Shroud was created by the Xozi Engineering Guild. It has extra radiation shielding"
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
if(hood)
hood.name = "\improper Rad-Plated Engineer's Guild Shroud helmet"
hood.desc = "A Shroud helmet designed for good visibility in low-light environments. It has extra radiation shielding"
hood.icon_state = "zaddat_engie"
hood.item_state = "zaddat_engie"
if("Spacer")
name = "\improper Rad-Plated Spacer's Guild Shroud"
base_name = "\improper Spacer's Guild Shroud"
desc = "The blue plastic Shroud worn by members of the Zaddat Spacer's Guild. It has extra radiation shielding"
icon_state = "zaddat_spacer"
item_state = "zaddat_spacer"
if(hood)
hood.name = "\improper Rad-Plated Spacer's Guild Shroud helmet"
hood.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction. It has extra radiation shielding"
hood.icon_state = "zaddat_spacer"
hood.item_state = "zaddat_spacer"
if("Knight")
name = "\improper Rad-Plated Knight's Shroud"
base_name = "\improper Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild. It has extra radiation shielding"
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
if(hood)
hood.name = "\improper Rad-Plated Knight's Shroud helm"
hood.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi. It has extra radiation shielding"
hood.icon_state = "zaddat_knight"
hood.item_state = "zaddat_knight"
if("Fashion")
name = "\improper Rad-Plated Avazi House Shroud"
base_name = "\improper Avazi House Shroud"
desc = "The designers of the Avazi Fashion House are among the most renowned in Zaddat society, and their Shroud designs second to none. It has extra radiation shielding"
icon_state = "zaddat_fashion"
item_state = "zaddat_fashion"
if(hood)
hood.name = "\improper Rad-Plated Avazi House Shroud helmet"
hood.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face. It has extra radiation shielding"
hood.icon_state = "zaddat_fashion"
hood.item_state = "zaddat_fashion"
if("Bishop")
name = "\improper Rad-Plated Bishop-patterned Shroud"
base_name = "\improper Bishop-patterned Shroud"
desc = "The bold designers of the Dzaz Fashion House chose to make this Bishop-themed Shroud design as a commentary on the symbiotic nature of Vanax and human culture. Allegedly. It has extra radiation shielding"
icon_state = "zaddat_bishop"
item_state = "zaddat_bishop"
if(hood)
hood.name = "\improper Rad-Plated Bishop-patterned Shroud helmet"
hood.desc = "The Shroud helmet that inspired a dozen lawsuits. It has extra radiation shielding"
hood.icon_state = "zaddat_bishop"
hood.item_state = "zaddat_bishop"
if("Rugged")
name = "rugged Rad-Plated Shroud"
base_name = "rugged Shroud"
desc = "This Shroud was patterned after from First Contact era human voidsuits. It has extra radiation shielding"
icon_state = "zaddat_rugged"
item_state = "zaddat_rugged"
if(hood)
hood.name = "rugged Rad-Plated Shroud helmet"
hood.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat. It has extra radiation shielding"
hood.icon_state = "zaddat_rugged"
hood.item_state = "zaddat_rugged"
if("Soft")
name = "\improper Rad-Plated soft Shroud"
base_name = "\improper soft Shroud"
desc = "Material and design is chosen for practical reasons, making it take as little space as possible when stowed whilst also providing reasonable comfort when worn for long periods. It has extra radiation shielding"
icon_state = "zaddat_soft"
item_state = "zaddat_soft"
if(hood)
hood.name = "\improper Rad-Plated soft Shroud hood"
hood.desc = "Not as solid as a proper helmet, but works nonetheless. It has extra radiation shielding"
hood.icon_state = "zaddat_soft"
hood.item_state = "zaddat_soft"
to_chat(M, "You finish customizing your Shroud. Looking good!")
has_been_customized = TRUE

207
code/modules/clothing/spacesuits/void/zaddat_yw.dm
View File

@@ -1,207 +0,0 @@
/obj/item/clothing/suit/space/void/zaddat/engineer
name = "\improper Engineer's Guild Shroud"
desc = "This rugged Shroud was created by the Xozi Engineering Guild."
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
helmet = new/obj/item/clothing/head/helmet/space/void/zaddat/engineer
/obj/item/clothing/head/helmet/space/void/zaddat/engineer
name = "\improper Engineer's Guild Shroud helmet"
desc = "A Shroud helmet designed for good visibility in low-light environments."
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/suit/space/void/zaddat/security
name = "\improper Security Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild."
armor = list(melee = 30, bullet = 20, laser = 20,energy = 10, bomb = 10, bio = 100, rad = 30)
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
helmet = new/obj/item/clothing/head/helmet/space/void/zaddat/security
/obj/item/clothing/head/helmet/space/void/zaddat/security
name = "\improper Security Knight's Shroud helm"
desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi."
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
armor = list(melee = 30, bullet = 20, laser = 20, energy = 10, bomb = 10, bio = 100, rad = 30)
/obj/item/clothing/suit/space/void/zaddat/security/custom_suit() //so it cant turn into looks that dont makes sense and keep security name in it
set name = "Customize Shroud"
set category = "Object"
set desc = "Pick an appearence for your Shroud."
var/mob/M = usr
var/suit_style = null
if(has_been_customized)
to_chat(M, "This Shroud has already been customized!")
return 0
suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft")
switch(suit_style)
if("Spacer")
name = "\improper Security Spacer's Guild Shroud"
base_name = "\improper Spacer's Guild Shroud"
desc = "The blue plastic Shroud worn by members of the Zaddat Spacer's Guild. This one has a layer of armor"
icon_state = "zaddat_spacer"
item_state = "zaddat_spacer"
if(helmet)
helmet.name = "\improper Security Spacer's Guild Shroud helmet"
helmet.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction. This one has a layer of armor"
helmet.icon_state = "zaddat_spacer"
helmet.item_state = "zaddat_spacer"
if("Knight")
name = "\improper Security Knight's Shroud"
base_name = "\improper Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild. This one has a layer of armor"
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
if(helmet)
helmet.name = "\improper Security Knight's Shroud helm"
helmet.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi. This one has a layer of armor"
helmet.icon_state = "zaddat_knight"
helmet.item_state = "zaddat_knight"
if("Fashion")
name = "\improper Security Avazi House Shroud"
base_name = "\improper Security Avazi House Shroud"
desc = "The designers of the Avazi Fashion House are among the most renowned in Zaddat society, and their Shroud designs second to none. This one has a layer of armor"
icon_state = "zaddat_fashion"
item_state = "zaddat_fashion"
if(helmet)
helmet.name = "\improper Security Avazi House Shroud helmet"
helmet.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face. This one has a layer of armor"
helmet.icon_state = "zaddat_fashion"
helmet.item_state = "zaddat_fashion"
if("Bishop")
name = "\improper Security Bishop-patterned Shroud"
base_name = "\improper Bishop-patterned Shroud"
desc = "The bold designers of the Dzaz Fashion House chose to make this Bishop-themed Shroud design as a commentary on the symbiotic nature of Vanax and human culture. Allegedly. This one has a layer of armor"
icon_state = "zaddat_bishop"
item_state = "zaddat_bishop"
if(helmet)
helmet.name = "\improper Security Bishop-patterned Shroud helmet"
helmet.desc = "The Shroud helmet that inspired a dozen lawsuits. This one has a layer of armor"
helmet.icon_state = "zaddat_bishop"
helmet.item_state = "zaddat_bishop"
if("Rugged")
name = "Security rugged Shroud"
base_name = "rugged Shroud"
desc = "This Shroud was patterned after from First Contact era human voidsuits. This one has a layer of armor"
icon_state = "zaddat_rugged"
item_state = "zaddat_rugged"
if(helmet)
helmet.name = "Security rugged Shroud helmet"
helmet.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat. This one has a layer of armor"
helmet.icon_state = "zaddat_rugged"
helmet.item_state = "zaddat_rugged"
to_chat(M, "You finish customizing your Shroud. Looking good!")
has_been_customized = TRUE
M.regenerate_icons()
return 1
/obj/item/clothing/suit/space/void/zaddat/engineer/custom_suit()
set name = "Customize Shroud"
set category = "Object"
set desc = "Pick an appearence for your Shroud."
var/mob/M = usr
var/suit_style = null
if(has_been_customized)
to_chat(M, "This Shroud has already been customized!")
return 0
suit_style = input(M, "Which suit style would you like?") in list("Engineer", "Spacer", "Knight", "Fashion", "Bishop", "Hegemony", "Rugged", "Soft")
switch(suit_style)
if("Engineer")
name = "\improper Rad-Plated Engineer's Guild Shroud"
base_name = "\improper Engineer's Guild Shroud"
desc = "This rugged Shroud was created by the Xozi Engineering Guild. It has extra radiation shielding"
icon_state = "zaddat_engie"
item_state = "zaddat_engie"
if(helmet)
helmet.name = "\improper Rad-Plated Engineer's Guild Shroud helmet"
helmet.desc = "A Shroud helmet designed for good visibility in low-light environments. It has extra radiation shielding"
helmet.icon_state = "zaddat_engie"
helmet.item_state = "zaddat_engie"
if("Spacer")
name = "\improper Rad-Plated Spacer's Guild Shroud"
base_name = "\improper Spacer's Guild Shroud"
desc = "The blue plastic Shroud worn by members of the Zaddat Spacer's Guild. It has extra radiation shielding"
icon_state = "zaddat_spacer"
item_state = "zaddat_spacer"
if(helmet)
helmet.name = "\improper Rad-Plated Spacer's Guild Shroud helmet"
helmet.desc = "A cool plastic-and-glass helmet designed after popular adventure fiction. It has extra radiation shielding"
helmet.icon_state = "zaddat_spacer"
helmet.item_state = "zaddat_spacer"
if("Knight")
name = "\improper Rad-Plated Knight's Shroud"
base_name = "\improper Knight's Shroud"
desc = "This distinctive steel-plated Shroud was popularized by the Noble Guild. It has extra radiation shielding"
icon_state = "zaddat_knight"
item_state = "zaddat_knight"
if(helmet)
helmet.name = "\improper Rad-Plated Knight's Shroud helm"
helmet.desc = "This spaceworthy helmet was patterned after the knight's helmets used by Zaddat before their discovery by the Unathi. It has extra radiation shielding"
helmet.icon_state = "zaddat_knight"
helmet.item_state = "zaddat_knight"
if("Fashion")
name = "\improper Rad-Plated Avazi House Shroud"
base_name = "\improper Avazi House Shroud"
desc = "The designers of the Avazi Fashion House are among the most renowned in Zaddat society, and their Shroud designs second to none. It has extra radiation shielding"
icon_state = "zaddat_fashion"
item_state = "zaddat_fashion"
if(helmet)
helmet.name = "\improper Rad-Plated Avazi House Shroud helmet"
helmet.desc = "The Avazi Fashion House recently designed this popular Shroud helmet, designed to pleasingly frame a Zaddat's face. It has extra radiation shielding"
helmet.icon_state = "zaddat_fashion"
helmet.item_state = "zaddat_fashion"
if("Bishop")
name = "\improper Rad-Plated Bishop-patterned Shroud"
base_name = "\improper Bishop-patterned Shroud"
desc = "The bold designers of the Dzaz Fashion House chose to make this Bishop-themed Shroud design as a commentary on the symbiotic nature of Vanax and human culture. Allegedly. It has extra radiation shielding"
icon_state = "zaddat_bishop"
item_state = "zaddat_bishop"
if(helmet)
helmet.name = "\improper Rad-Plated Bishop-patterned Shroud helmet"
helmet.desc = "The Shroud helmet that inspired a dozen lawsuits. It has extra radiation shielding"
helmet.icon_state = "zaddat_bishop"
helmet.item_state = "zaddat_bishop"
if("Rugged")
name = "rugged Rad-Plated Shroud"
base_name = "rugged Shroud"
desc = "This Shroud was patterned after from First Contact era human voidsuits. It has extra radiation shielding"
icon_state = "zaddat_rugged"
item_state = "zaddat_rugged"
if(helmet)
helmet.name = "rugged Rad-Plated Shroud helmet"
helmet.desc = "Supposedly, this helmet should make humans more comfortable and familiar with the Zaddat. It has extra radiation shielding"
helmet.icon_state = "zaddat_rugged"
helmet.item_state = "zaddat_rugged"
if("Soft")
name = "\improper Rad-Plated soft Shroud"
base_name = "\improper soft Shroud"
desc = "Material and design is chosen for practical reasons, making it take as little space as possible when stowed whilst also providing reasonable comfort when worn for long periods. It has extra radiation shielding"
icon_state = "zaddat_soft"
item_state = "zaddat_soft"
if(helmet)
helmet.name = "\improper Rad-Plated soft Shroud hood"
helmet.desc = "Not as solid as a proper helmet, but works nonetheless. It has extra radiation shielding"
helmet.icon_state = "zaddat_soft"
helmet.item_state = "zaddat_soft"
to_chat(M, "You finish customizing your Shroud. Looking good!")
has_been_customized = TRUE
M.regenerate_icons()
return 1

73
code/modules/clothing/suits/hooded.dm
View File

@@ -1,76 +1,7 @@
// Hooded suits
//Hoods for winter coats and chaplain hoodie etc
/obj/item/clothing/suit/
name = DEVELOPER_WARNING_NAME
var/obj/item/clothing/head/hood
var/hoodtype = null //so the chaplain hoodie or other hoodies can override this
var/hood_up = FALSE
var/toggleicon
actions_types = list(/datum/action/item_action/toggle_hood)
/obj/item/clothing/suit/storage/hooded/New()
toggleicon = "[initial(icon_state)]"
MakeHood()
..()
/obj/item/clothing/suit/storage/hooded/Destroy()
QDEL_NULL(hood)
return ..()
/obj/item/clothing/suit/storage/hooded/proc/MakeHood()
if(!hood && hoodtype)
var/obj/item/clothing/head/hood/H = new hoodtype(src)
hood = H
/obj/item/clothing/suit/storage/hooded/ui_action_click(mob/user, actiontype)
ToggleHood()
/obj/item/clothing/suit/storage/hooded/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood()
..()
/obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
hood_up = FALSE
update_icon()
if(hood)
hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.forceMove(src)
/obj/item/clothing/suit/storage/hooded/dropped(mob/user)
RemoveHood()
..()
/obj/item/clothing/suit/storage/hooded/proc/ToggleHood()
if(!hood_up)
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
if(color != hood.color)
hood.color = color
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = TRUE
hood.canremove = FALSE
update_icon()
H.update_inv_wear_suit()
else
RemoveHood()
/obj/item/clothing/suit/storage/hooded/update_icon()
. = ..()
icon_state = "[toggleicon][hood_up ? "_t" : ""]"
/obj/item/clothing/suit/storage/hooded
has_hood_sprite = TRUE //These all have suit sprites that HAVE hood sprites.
/obj/item/clothing/suit/storage/hooded/costume
name = DEVELOPER_WARNING_NAME

181
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -64,47 +64,11 @@
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "coatroiz"
item_state_slots = list(slot_r_hand_str = "coatroiz", slot_l_hand_str = "coatroiz")
//hoodtype = ??? //This needs a hoodtype set...I'm not a spriter, so someone else will have to do it.
has_hood_sprite = TRUE
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "coatroiz_mob"
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/ui_action_click(mob/user, actiontype)
ToggleHood_roiz()
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood_roiz()
..()
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/proc/RemoveHood_roiz()
icon_state = "coatroiz"
item_state = "coatroiz_mob"
hood_up = 0
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/proc/ToggleHood_roiz()
if(!hood_up)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = 1
icon_state = "coatroiz_t"
item_state = "coatroiz_mob_t"
H.update_inv_wear_suit()
else
RemoveHood_roiz()
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/digest_act(var/atom/movable/item_storage = null)
return FALSE
@@ -1503,43 +1467,9 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "kilanocoat_mob"
//hoodtype = ??? //Needs a hoodtype to be created for it.
has_hood_sprite = TRUE
/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat/ui_action_click(mob/user, actiontype)
ToggleHood_kilano()
/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood_kilano()
..()
/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat/proc/RemoveHood_kilano()
icon_state = "kilanocoat"
item_state = "kilanocoat_mob"
hood_up = 0
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat/proc/ToggleHood_kilano()
if(!hood_up)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = 1
icon_state = "kilanocoat_t"
item_state = "kilanocoat_mob_t"
H.update_inv_wear_suit()
else
RemoveHood_kilano()
//BeyondMyLife: Ne'tra Ky'ram
/obj/item/clothing/under/fluff/kilanosuit
@@ -2310,6 +2240,8 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_onmob_vr.dmi'
item_state = "mechacoat_mob"
hoodtype = /obj/item/clothing/head/hood/winter/fluff/mechanic
has_hood_sprite = TRUE
/obj/item/clothing/head/hood/winter/fluff/mechanic
name = "mechanic winter hood"
@@ -2320,43 +2252,6 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_onmob_vr.dmi'
item_state = "mechahood_mob"
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/ui_action_click(mob/user, actiontype)
ToggleHood_mechacoat()
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood_mechacoat()
..()
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/RemoveHood_mechacoat()
icon_state = "mechacoat"
item_state = "mechacoat_mob"
hood_up = 0
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/ToggleHood_mechacoat()
if(!hood_up)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = 1
icon_state = "mechacoat_t"
item_state = "mechacoat_mob_t"
H.update_inv_wear_suit()
else
RemoveHood_mechacoat()
//Pandora029 : Evelyn Tareen
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn
name = "warden's navy winter coat"
@@ -2367,6 +2262,8 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_onmob_vr.dmi'
item_state = "evelyncoat_mob"
hoodtype = /obj/item/clothing/head/hood/winter/security/fluff/evelyn
has_hood_sprite = TRUE
/obj/item/clothing/head/hood/winter/security/fluff/evelyn
name = "warden's navy winter hood"
@@ -2378,42 +2275,38 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_onmob_vr.dmi'
item_state = "evelynhood_mob"
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/ui_action_click(mob/user, actiontype)
ToggleHood_evelyn()
//Allweek:Fifi the Magnificent
/obj/item/clothing/head/fluff/fifi_hat
name = "fifi's hat"
desc = "It's a colorful hat for an eccentric entertaining cat."
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood_evelyn()
..()
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "fifi_hat"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "fifi_hat"
/obj/item/clothing/under/fluff/fifi_jumpsuit
name = "fifi's jumpsuit"
desc = "It's a colorful outfit for an eccentric entertaining cat."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "fifi_jumpsuit"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "fifi_jumpsuit"
/obj/item/clothing/shoes/fluff/fifi_socks
name = "fifi's socks"
desc = "A pair of colorful socks for an eccentric entertaining cat."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "fifi_socks"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "fifi_socks"
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/proc/RemoveHood_evelyn()
icon_state = "evelyncoat"
item_state = "evelyncoat_mob"
hood_up = 0
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn/proc/ToggleHood_evelyn()
if(!hood_up)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = 1
icon_state = "evelyncoat_t"
item_state = "evelyncoat_mob_t"
H.update_inv_wear_suit()
else
RemoveHood_evelyn()
//Uncle_Fruit_VEVO - Bradley Khatibi
/obj/item/clothing/shoes/fluff/airjordans

52
code/modules/vore/fluffstuff/custom_clothes_yw.dm
View File

@@ -910,58 +910,6 @@
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_override = 'icons/vore/custom_onmob_yw.dmi'
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/New()
MakeHood()
..()
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/Destroy()
qdel(hood)
return ..()
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/proc/MakeHood()
if(!hood)
var/obj/item/clothing/head/hood/hoodiebuttoned/W = new hoodtype(src)
hood = W
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/ui_action_click()
ToggleHood()
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood()
..()
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/proc/RemoveHood()
suittoggled = 0
hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.forceMove(src)
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/dropped(mob/living/user)
RemoveHood()
..()
/obj/item/clothing/suit/storage/toggle/hoodiebuttoned/proc/ToggleHood()
if(!suittoggled)
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
suittoggled = 1
hood.canremove = FALSE
H.update_inv_wear_suit()
else
RemoveHood()
/obj/item/clothing/head/hood/hoodiebuttoned
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."

1
vorestation.dme
View File

@@ -2461,7 +2461,6 @@
#include "code\modules\clothing\spacesuits\void\void_vr.dm"
#include "code\modules\clothing\spacesuits\void\wizard.dm"
#include "code\modules\clothing\spacesuits\void\zaddat.dm"
#include "code\modules\clothing\spacesuits\void\zaddat_yw.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\armor_vr.dm"
#include "code\modules\clothing\suits\armor_yw.dm"