mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Rig glovefix and Clothing protection fix (#10263)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
5c09ba759a
commit
38658b4dad
@@ -907,6 +907,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
|
||||
state2use += "_l"
|
||||
|
||||
// testing("[src] (\ref[src]) - Slot: [slot_name], Inhands: [inhands], Worn Icon:[icon2use], Worn State:[state2use], Worn Layer:[layer2use]")
|
||||
// Send icon data to unit test when it is running, hello old testing(). I'm like, your great great grandkid! THE FUTURE IS NOW OLD MAN!
|
||||
#ifdef UNIT_TEST
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(ishuman(H))
|
||||
SEND_SIGNAL(H, COMSIG_UNITTEST_DATA, list("set_slot",slot_name,icon2use,state2use,inhands,type,H.species?.name))
|
||||
#endif
|
||||
|
||||
//Generate the base onmob icon
|
||||
var/icon/standing_icon = icon(icon = icon2use, icon_state = state2use)
|
||||
|
||||
@@ -82,7 +82,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
//FINE SMOKABLES//
|
||||
//////////////////
|
||||
/obj/item/clothing/mask/smokable
|
||||
name = "smokable item"
|
||||
name = DEVELOPER_WARNING_NAME // "smokable item"
|
||||
desc = "You're not sure what this is. You should probably ahelp it."
|
||||
body_parts_covered = 0
|
||||
var/lit = 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/obj/item/clothing/mask/smokable/ecig
|
||||
name = "electronic cigarette"
|
||||
name = DEVELOPER_WARNING_NAME // "electronic cigarette"
|
||||
desc = "For the modern approach to smoking."
|
||||
icon = 'icons/obj/ecig.dmi'
|
||||
var/active = 0
|
||||
|
||||
@@ -42,10 +42,6 @@ Protectiveness | Armor %
|
||||
if(material_key) // May still be null if a material was not specified as a default.
|
||||
set_material(material_key)
|
||||
|
||||
/obj/item/clothing/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/get_material()
|
||||
return material
|
||||
|
||||
@@ -214,7 +210,7 @@ Protectiveness | Armor %
|
||||
desc = "A thin plate of padded material, designed to fit into a plate carrier. Attaches to a plate carrier."
|
||||
icon = 'icons/obj/clothing/modular_armor.dmi'
|
||||
icon_state = "armor_light"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
body_parts_covered = CHEST
|
||||
slot = ACCESSORY_SLOT_ARMOR_C
|
||||
material_armor_modifier = 0.8
|
||||
material_slowdown_modifier = 0.5 //Subtracted from total slowdown
|
||||
@@ -225,7 +221,7 @@ Protectiveness | Armor %
|
||||
desc = "A thick plate of padded material, designed to fit into a plate carrier. Attaches to a plate carrier."
|
||||
icon = 'icons/obj/clothing/modular_armor.dmi'
|
||||
icon_state = "armor_medium"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
body_parts_covered = CHEST
|
||||
slot = ACCESSORY_SLOT_ARMOR_C
|
||||
material_armor_modifier = 1.2
|
||||
material_slowdown_modifier = 0
|
||||
@@ -236,7 +232,7 @@ Protectiveness | Armor %
|
||||
desc = "A composite plate of custom machined material, designed to fit into a plate carrier. Attaches to a plate carrier."
|
||||
icon = 'icons/obj/clothing/modular_armor.dmi'
|
||||
icon_state = "armor_tactical"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
body_parts_covered = CHEST
|
||||
slot = ACCESSORY_SLOT_ARMOR_C
|
||||
material_armor_modifier = 1.2
|
||||
material_slowdown_modifier = 0.5
|
||||
|
||||
@@ -46,9 +46,6 @@
|
||||
/obj/item/clothing/under/swimsuit/striped,
|
||||
/obj/item/clothing/under/swimsuit/white,
|
||||
/obj/item/clothing/under/swimsuit/earth,
|
||||
/obj/item/clothing/under/wetsuit,
|
||||
/obj/item/clothing/under/wetsuit_rec,
|
||||
/obj/item/clothing/under/wetsuit_skimpy,
|
||||
/obj/item/clothing/mask/snorkel = 2,
|
||||
/obj/item/clothing/shoes/swimmingfins = 2)
|
||||
|
||||
|
||||
@@ -88,7 +88,6 @@
|
||||
/obj/random/tank,
|
||||
/obj/random/tech_supply/component,
|
||||
/obj/random/tech_supply/component,
|
||||
/obj/item/clothing/head/helmet/eraticator,
|
||||
/obj/effect/decal/remains/mouse,
|
||||
/obj/item/stack/material/steel{amount = 20}
|
||||
)
|
||||
@@ -177,4 +176,4 @@
|
||||
rare_loot = list(
|
||||
/obj/item/clothing/suit/armor/reactive,
|
||||
/obj/item/personal_shield_generator/belt/magnetbelt
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user