[MIRROR] Adds a muzzle-breathmask (#4865)

* Adds a muzzle-breathmask (#58330)

* Adds a muzzle-breathmask

Co-authored-by: Greniza <61635418+Greniza@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-04-13 02:01:56 +01:00
committed by GitHub
co-authored by Greniza
parent 3f112d5c79
commit 6840dbe9c7
9 changed files with 28 additions and 2 deletions
+2
View File
@@ -54,6 +54,8 @@
#define ANTI_TINFOIL_MANEUVER (1<<12) //Hats with negative effects when worn (i.e the tinfoil hat).
#define DANGEROUS_OBJECT (1<<13) //Clothes that cause a larger notification when placed on a person.
#define LARGE_WORN_ICON (1<<14) //Clothes that use large icons, for applying the proper overlays like blood
/// Clothes that block speech (i.e the muzzle). Can be applied to any clothing piece.
#define BLOCKS_SPEECH (1<<15)
/// Flags for the organ_flags var on /obj/item/organ
+1
View File
@@ -79,6 +79,7 @@ DEFINE_BITFIELD(car_traits, list(
DEFINE_BITFIELD(clothing_flags, list(
"ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
"BLOCKS_SHOVE_KNOCKDOWN" = BLOCKS_SHOVE_KNOCKDOWN,
"BLOCKS_SPEECH" = BLOCKS_SPEECH,
"BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
"LAVAPROTECT" = LAVAPROTECT,
"MASKINTERNALS" = MASKINTERNALS,
@@ -28,7 +28,7 @@
for(var/i in 1 to 3)
new /obj/item/tank/internals/anesthetic(src)
for(var/i in 1 to 3)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breathmuzzle(src)
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
@@ -3,6 +3,7 @@
desc = "To stop that awful noise."
icon_state = "muzzle"
inhand_icon_state = "blindfold"
clothing_flags = BLOCKS_SPEECH
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.9
@@ -16,6 +17,25 @@
return
..()
/obj/item/clothing/mask/breathmuzzle
name = "surgery mask"
desc = "To silence those pesky patients before putting them under."
icon_state = "breathmuzzle"
inhand_icon_state = "breathmuzzle"
clothing_flags = MASKINTERNALS | BLOCKS_SPEECH
gas_transfer_coefficient = 0.1
permeability_coefficient = 0.01
equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle
/obj/item/clothing/mask/breathmuzzle/attack_paw(mob/user, list/modifiers)
// The breathmuzzle is similar enough to a regular muzzle that similar rules would apply to both.
if(iscarbon(user))
var/mob/living/carbon/carbon_user = user
if(src == carbon_user.wear_mask)
to_chat(user, "<span class='warning'>You need help taking this off!</span>")
return
..()
/obj/item/clothing/mask/surgical
name = "sterile mask"
desc = "A sterile mask designed to help prevent the spread of diseases."
+4 -1
View File
@@ -210,7 +210,10 @@
loc.handle_fall(src)//it's loc so it doesn't call the mob's handle_fall which does nothing
/mob/living/carbon/is_muzzled()
return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
for (var/obj/item/clothing/clothing in get_equipped_items())
if(clothing.clothing_flags & BLOCKS_SPEECH)
return TRUE
return FALSE
/mob/living/carbon/hallucinating()
if(hallucination)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 40 KiB