mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +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
@@ -68,7 +68,11 @@
|
||||
item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas")
|
||||
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
|
||||
body_parts_covered = HEAD|FACE|EYES
|
||||
|
||||
heat_protection = HEAD
|
||||
cold_protection = HEAD
|
||||
sprite_sheets = list(
|
||||
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
|
||||
)
|
||||
/obj/item/clothing/mask/gas/plaguedoctor/gold
|
||||
name = "gold plague doctor mask"
|
||||
desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply. This one is gold."
|
||||
|
||||
@@ -19,8 +19,3 @@
|
||||
icon_override = 'icons/inventory/face/mob_vr.dmi'
|
||||
body_parts_covered = FACE|EYES
|
||||
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
|
||||
|
||||
/obj/item/clothing/mask/gas/plaguedoctor
|
||||
sprite_sheets = list(
|
||||
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
|
||||
)
|
||||
|
||||
@@ -97,6 +97,7 @@
|
||||
|
||||
//scarves (fit in in mask slot)
|
||||
//None of these actually have on-mob sprites...
|
||||
/* //Lost to time.
|
||||
/obj/item/clothing/mask/bluescarf
|
||||
name = "blue neck scarf"
|
||||
desc = "A blue neck scarf."
|
||||
@@ -123,11 +124,11 @@
|
||||
item_flags = FLEXIBLEMATERIAL
|
||||
w_class = ITEMSIZE_SMALL
|
||||
gas_transfer_coefficient = 0.90
|
||||
|
||||
*/
|
||||
/obj/item/clothing/mask/ninjascarf
|
||||
name = "ninja scarf"
|
||||
desc = "A stealthy, dark scarf."
|
||||
icon_state = "ninja_scarf"
|
||||
icon_state = "s-ninja"
|
||||
body_parts_covered = FACE
|
||||
item_flags = FLEXIBLEMATERIAL
|
||||
w_class = ITEMSIZE_SMALL
|
||||
@@ -187,7 +188,7 @@
|
||||
body_parts_covered = HEAD|FACE|EYES
|
||||
w_class = ITEMSIZE_SMALL
|
||||
siemens_coefficient = 0.9
|
||||
|
||||
/* //Lost to time.
|
||||
/obj/item/clothing/mask/nock_scarab
|
||||
name = "nock mask (blue, scarab)"
|
||||
desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself."
|
||||
@@ -215,7 +216,7 @@
|
||||
icon_state = "nock_ornate"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
body_parts_covered = HEAD|FACE
|
||||
|
||||
*/
|
||||
/obj/item/clothing/mask/horsehead/New()
|
||||
..()
|
||||
// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
desc = "A round dark muzzle made of LEDs."
|
||||
flags = PHORONGUARD //Since it cant easily be removed...
|
||||
item_flags = AIRTIGHT | FLEXIBLEMATERIAL | BLOCK_GAS_SMOKE_EFFECT //This should make it properly work as a mask... and allow you to eat stuff through it!
|
||||
body_parts_covered = FACE|EYES
|
||||
icon = 'icons/mob/species/teshari/synth_facemask.dmi'
|
||||
icon_override = 'icons/mob/species/teshari/synth_facemask.dmi'
|
||||
icon_state = "synth_facemask"
|
||||
@@ -28,6 +27,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/mask/synthfacemask/Destroy()
|
||||
maskmaster = null
|
||||
. = ..()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user