mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] Finish Machinery new to init (#10439)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
23d8f3fc97
commit
c844cc3dee
@@ -1,9 +1,9 @@
|
||||
/* ChompRemoval: Oops that's a glogged implementation (intentional). Im going to properly implement obj/clothing/mask/gas/clear instead.
|
||||
// Our clear gas masks don't hide faces, but changing the var on mask/gas would require un-chaging it on all children. This is nicer.
|
||||
/obj/item/clothing/mask/gas/New()
|
||||
/obj/item/clothing/mask/gas/Initialize(mapload)
|
||||
. = ..()
|
||||
if(type == /obj/item/clothing/mask/gas)
|
||||
flags_inv &= ~HIDEFACE
|
||||
..()
|
||||
|
||||
// Since we changed the gas mask sprite, if we want the old one for some reason use this.
|
||||
/obj/item/clothing/mask/gas/wwii
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
|
||||
w_class = ITEMSIZE_TINY
|
||||
|
||||
/obj/item/clothing/mask/muzzle/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/muzzle/Initialize(mapload)
|
||||
. = ..()
|
||||
say_messages = list("Mmfph!", "Mmmf mrrfff!", "Mmmf mnnf!")
|
||||
say_verbs = list("mumbles", "says")
|
||||
|
||||
@@ -217,8 +217,8 @@
|
||||
w_class = ITEMSIZE_SMALL
|
||||
body_parts_covered = HEAD|FACE
|
||||
*/
|
||||
/obj/item/clothing/mask/horsehead/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/horsehead/Initialize(mapload)
|
||||
. = ..()
|
||||
// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
|
||||
say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
|
||||
say_verbs = list("whinnies", "neighs", "says")
|
||||
@@ -232,7 +232,8 @@
|
||||
body_parts_covered = 0
|
||||
var/mob/observer/eye/aiEye/eye
|
||||
|
||||
/obj/item/clothing/mask/ai/New()
|
||||
/obj/item/clothing/mask/ai/Initialize(mapload)
|
||||
. = ..()
|
||||
eye = new(src)
|
||||
|
||||
/obj/item/clothing/mask/ai/equipped(var/mob/user, var/slot)
|
||||
|
||||
@@ -33,6 +33,6 @@
|
||||
changer.voice = null
|
||||
to_chat(usr, span_notice("You have reset your voice changer's mimicry feature."))
|
||||
|
||||
/obj/item/clothing/mask/gas/voice/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/gas/voice/Initialize(mapload)
|
||||
. = ..()
|
||||
changer = new(src)
|
||||
|
||||
Reference in New Issue
Block a user