Skeleton suit for humans as well as voxes (#24494)

* skeleton suits for all races

* removes useless comment
This commit is contained in:
RealestEstate
2019-10-19 20:43:14 -07:00
committed by Kurfursten
parent 1e03a2c4b3
commit 64d3474a84
7 changed files with 33 additions and 20 deletions

View File

@@ -463,7 +463,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
name = "Halloween costumes"
contains = list(/obj/item/clothing/suit/space/plasmaman/moltar,
/obj/item/clothing/head/helmet/space/plasmaman/moltar,
/obj/item/clothing/under/skelevoxsuit,
/obj/item/clothing/under/skelesuit,
/obj/item/clothing/head/snake,
/obj/item/clothing/mask/vamp_fangs,
/obj/item/clothing/head/franken_bolt,
@@ -728,10 +728,10 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
cost = 150
containertype = /obj/structure/closet/crate/basic
containername = "contacts crate"
group = "Clothing"
group = "Clothing"
//Winter Coats//
/datum/supply_packs/engwinter
name = "Engineering Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/engineering,
@@ -744,7 +744,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "engineering winter coats"
group = "Clothing"
/datum/supply_packs/sciwinter
name = "Science Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/medical/science,
@@ -756,7 +756,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "science winter coats"
group = "Clothing"
/datum/supply_packs/secwinter
name = "Security Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/security,
@@ -769,7 +769,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "security winter coats"
group = "Clothing"
/datum/supply_packs/medwinter
name = "Medical Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/medical,
@@ -782,7 +782,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "medical winter coats"
group = "Clothing"
/datum/supply_packs/svcwinter
name = "Service Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/hydro,
@@ -794,7 +794,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "service winter coats"
group = "Clothing"
/datum/supply_packs/civwinter
name = "Civilian Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/prisoner,
@@ -806,7 +806,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "civilian winter coats"
group = "Clothing"
/datum/supply_packs/crgwinter
name = "Cargo Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/cargo,
@@ -821,7 +821,7 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
containertype = /obj/structure/closet/crate/basic
containername = "cargo winter coats"
group = "Clothing"
/datum/supply_packs/mscwinter
name = "Misc. Winterwear"
contains = list(/obj/item/clothing/suit/storage/wintercoat/security/captain,

View File

@@ -71,7 +71,7 @@
list(/obj/item/clothing/head/wizard/lich, /obj/item/clothing/suit/wizrobe/lich, /obj/item/clothing/suit/wizrobe/skelelich),
list(/obj/item/clothing/suit/space/plasmaman/cultist, /obj/item/clothing/head/helmet/space/plasmaman/cultist),
list(/obj/item/clothing/head/helmet/space/plasmaman/security/captain, /obj/item/clothing/suit/space/plasmaman/security/captain),
/obj/item/clothing/under/skelevoxsuit,
/obj/item/clothing/under/skelesuit,
list(/obj/item/clothing/suit/storage/wintercoat/engineering/ce, /obj/item/clothing/suit/storage/wintercoat/medical/cmo, /obj/item/clothing/suit/storage/wintercoat/security/hos, /obj/item/clothing/suit/storage/wintercoat/hop, /obj/item/clothing/suit/storage/wintercoat/security/captain, /obj/item/clothing/suit/storage/wintercoat/clown, /obj/item/clothing/suit/storage/wintercoat/slimecoat),
list(/obj/item/clothing/head/helmet/space/rig/wizard, /obj/item/clothing/suit/space/rig/wizard, /obj/item/clothing/gloves/purple/wizard, /obj/item/clothing/shoes/sandal),
list(/obj/item/clothing/head/helmet/space/rig/knight, /obj/item/clothing/head/helmet/space/rig/knight),

View File

@@ -698,7 +698,7 @@
icon_state = "nr_uniform"
item_state = "nr_uniform"
_color = "nr_uniform"
/*
/obj/item/clothing/under/skelevoxsuit
name = "skelevox suit"
desc = "Feels like wearing literally nothing at all!"
@@ -707,7 +707,7 @@
_color = "vox-skelesuit"
species_restricted = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED)
*/
/obj/item/clothing/under/rottensuit
name = "rotten suit"
desc = "This suit seems perfect for wearing underneath a disguise."
@@ -781,4 +781,15 @@
desc = "for clowns living in a society"
icon_state = "clownsuit"
item_state = "clownsuit"
_color = "clownsuit"
_color = "clownsuit"
/obj/item/clothing/under/skelesuit
name = "skeleton suit"
desc = "Inside of everyone there is a spooky skinman waiting to escape"
icon_state = "skelesuit"
item_state = "skelesuit"
_color = "skelesuit"
species_fit = list(VOX_SHAPED)
clothing_flags = ONESIZEFITSALL
flags = HIDEHAIRCOMPLETELY | HIDEBEARDHAIR
body_parts_covered = FULL_HEAD|BEARD

View File

@@ -315,7 +315,8 @@ var/global/list/damage_icon_parts = list()
var/icon/face_standing = new /icon('icons/mob/human_face.dmi',"bald_s")
var/hair_suffix = check_hidden_head_flags(HIDEHEADHAIR) ? "s2" : "s" // s2 = cropped icon
if(my_appearance.f_style && !check_hidden_head_flags(HIDEBEARDHAIR))
if(my_appearance.f_style && !(check_hidden_head_flags(HIDEBEARDHAIR)||\
src.w_uniform && (src.w_uniform.body_parts_covered & HIDEBEARDHAIR)) )//you may be wondering why a uniform check. this exist for body suits like the skelesuit
var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[my_appearance.f_style]
if((facial_hair_style) && (src.species.name in facial_hair_style.species_allowed))
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
@@ -326,7 +327,8 @@ var/global/list/damage_icon_parts = list()
//warning("Invalid my_appearance.f_style for [species.name]: [my_appearance.f_style]")
if(my_appearance.h_style && !(src.head && ( src.head.flags & HIDEHAIRCOMPLETELY ) || \
src.wear_mask && (src.wear_mask.body_parts_covered & HIDEHEADHAIR) ) )
src.wear_mask && (src.wear_mask.body_parts_covered & HIDEHEADHAIR) ||\
src.w_uniform && (src.w_uniform.body_parts_covered & HIDEHEADHAIR)) ) //ditto the comment above
var/datum/sprite_accessory/hair_style = hair_styles_list[my_appearance.h_style]
if((hair_style) && (src.species.name in hair_style.species_allowed))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_[hair_suffix]")
@@ -394,14 +396,14 @@ var/global/list/damage_icon_parts = list()
O.overlays += image(icon = O.icon, icon_state = "lasereyes_s")
add_image = 1
if((M_RESIST_COLD in mutations) && (M_RESIST_HEAT in mutations))
if(!(src.species.name == "Vox") && !(src.species.name == "Skeletal Vox"))
if(!(src.species.name == "Vox") && !(src.species.name == "Skeletal Vox"))
//standing.underlays -= "cold[fat]_s"
//standing.underlays -= "fire[fat]_s"
//standing.underlays += "coldfire[fat]_s"
O.underlays -= "cold[fat]_s"
O.underlays -= "fire[fat]_s"
O.underlays += "coldfire[fat]_s"
else if((src.species.name == "Vox") || (src.species.name == "Skeletal Vox"))
else if((src.species.name == "Vox") || (src.species.name == "Skeletal Vox"))
O.underlays -= "coldvox_s"
O.underlays -= "firevox_s"
O.underlays += "coldfirevox_s"
@@ -1129,7 +1131,7 @@ var/global/list/damage_icon_parts = list()
O.pixel_x = species.inventory_offsets["[slot_handcuffed]"]["pixel_x"] * PIXEL_MULTIPLIER
O.pixel_y = species.inventory_offsets["[slot_handcuffed]"]["pixel_y"] * PIXEL_MULTIPLIER
obj_to_plane_overlay(O,HANDCUFF_LAYER)
if(update_icons)
update_icons()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 KiB

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB