12/21 modernizations from TG live (#103)

* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes

code/modules/clothing/masks/boxing.dm

@@ -5,7 +5,7 @@
 	item_state = "balaclava"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/adjust)
 
 /obj/item/clothing/mask/balaclava/attack_self(mob/user)
@@ -17,13 +17,13 @@
 	icon_state = "luchag"
 	item_state = "luchag"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/clothing/mask/luchador/speechModification(message)
 	if(copytext(message, 1, 2) != "*")
-		message = replacetext(message, "captain", "CAPITÁN")
-		message = replacetext(message, "station", "ESTACIÓN")
-		message = replacetext(message, "sir", "SEÑOR")
+		message = replacetext(message, "captain", "CAPITÁN")
+		message = replacetext(message, "station", "ESTACIÓN")
+		message = replacetext(message, "sir", "SEÑOR")
 		message = replacetext(message, "the ", "el ")
 		message = replacetext(message, "my ", "mi ")
 		message = replacetext(message, "is ", "es ")
@@ -52,4 +52,4 @@
 	name = "Rudos Mask"
 	desc = "Worn by robust fighters who are willing to do anything to win."
 	icon_state = "luchar"
-	item_state = "luchar"
+	item_state = "luchar"

code/modules/clothing/masks/breath.dm

@@ -6,13 +6,13 @@
 	body_parts_covered = 0
 	flags = MASKINTERNALS
 	visor_flags = MASKINTERNALS
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.10
 	permeability_coefficient = 0.50
 	actions_types = list(/datum/action/item_action/adjust)
 	flags_cover = MASKCOVERSMOUTH
 	visor_flags_cover = MASKCOVERSMOUTH
-	burn_state = FIRE_PROOF
+	resistance_flags = 0
 
 /obj/item/clothing/mask/breath/attack_self(mob/user)
 	adjustmask(user)

code/modules/clothing/masks/gasmask.dm

@@ -4,12 +4,12 @@
 	icon_state = "gas_alt"
 	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
-	w_class = 3
+	w_class = WEIGHT_CLASS_NORMAL
 	item_state = "gas_alt"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
-	burn_state = FIRE_PROOF
+	resistance_flags = 0
 
 // **** Welding gas mask ****
 
@@ -20,23 +20,18 @@
 	materials = list(MAT_METAL=4000, MAT_GLASS=2000)
 	flash_protect = 2
 	tint = 2
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 55)
 	origin_tech = "materials=2;engineering=3"
 	actions_types = list(/datum/action/item_action/toggle)
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
 	flags_cover = MASKCOVERSEYES
 	visor_flags_inv = HIDEEYES
 	visor_flags_cover = MASKCOVERSEYES
+	resistance_flags = FIRE_PROOF
 
-/obj/item/clothing/mask/gas/welding/attack_self()
-	toggle()
+/obj/item/clothing/mask/gas/welding/attack_self(mob/user)
+	weldingvisortoggle(user)
 
-/obj/item/clothing/mask/gas/welding/verb/toggle()
-	set category = "Object"
-	set name = "Adjust welding mask"
-	set src in usr
-
-	weldingvisortoggle()
 
 // ********************************************************************
 
@@ -46,7 +41,7 @@
 	desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
 	item_state = "gas_mask"
-	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0, fire = 0, acid = 0)
 
 /obj/item/clothing/mask/gas/syndicate
 	name = "syndicate mask"
@@ -61,14 +56,11 @@
 	icon_state = "clown"
 	item_state = "clown_hat"
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	actions_types = list(/datum/action/item_action/adjust)
 	dog_fashion = /datum/dog_fashion/head/clown
 
-/obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
-	AltClick(user)
-
-/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/living/user)
+/obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user)
 	if(!istype(user) || user.incapacitated())
 		return
 
@@ -96,7 +88,7 @@
 	icon_state = "sexyclown"
 	item_state = "sexyclown"
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
@@ -105,7 +97,7 @@
 	icon_state = "mime"
 	item_state = "mime"
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	actions_types = list(/datum/action/item_action/adjust)
 
 /obj/item/clothing/mask/gas/mime/attack_self(mob/user)
@@ -135,7 +127,7 @@
 	icon_state = "monkeymask"
 	item_state = "monkeymask"
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clothing/mask/gas/sexymime
 	name = "sexy mime mask"
@@ -144,7 +136,7 @@
 	icon_state = "sexymime"
 	item_state = "sexymime"
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clothing/mask/gas/death_commando
 	name = "Death Commando Mask"
@@ -155,7 +147,7 @@
 	name = "cyborg visor"
 	desc = "Beep boop."
 	icon_state = "death"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clothing/mask/gas/owl_mask
 	name = "owl mask"
@@ -163,98 +155,9 @@
 	icon_state = "owl"
 	flags = MASKINTERNALS
 	flags_cover = MASKCOVERSEYES
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clothing/mask/gas/carp
 	name = "carp mask"
 	desc = "Gnash gnash."
 	icon_state = "carp_mask"
-
-/obj/item/clothing/mask/gas/yautja_fake
-	name = "ceremonial mask"
-	desc = "A beautifully designed metallic face mask. This one appears to be mostly decorative."
-	icon_state = "pred_mask"
-	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
-	item_state = "pred_mask"
-	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
-	burn_state = LAVA_PROOF
-	var/list/options = list()
-	var/current_skin = ""
-
-/obj/item/clothing/mask/gas/yautja_fake/New()
-	options["Jawbone"] = "jaw"
-	options["Plain"]   = "plain"
-	options["Horned"]  = "horn"
-	options["Winged"]  = "wing"
-	options["Cancel"]  = null
-
-/obj/item/clothing/mask/gas/yautja_fake/examine(mob/user)
-	..()
-	if(!current_skin)
-		user << "<span class='notice'>Alt-click [src.name] to reskin it.</span>"
-
-/obj/item/clothing/mask/gas/yautja_fake/proc/reskin_mask(mob/M)
-	var/choice = input(M,"Warning, you can only reskin your mask once!","Reskin Mask") in options
-
-	if(src && choice && !current_skin && !M.incapacitated() && in_range(M,src))
-		if(options[choice] == null)
-			return
-		current_skin = options[choice]
-		icon_state = "[initial(icon_state)]_[current_skin]"
-		item_state = "[initial(item_state)]_[current_skin]"
-		M << "Your mask is now skinned as \"[choice]\"."
-		update_icon()
-		M.regenerate_icons()
-
-/obj/item/clothing/mask/gas/yautja_fake/AltClick(mob/user)
-	..()
-	if(user.incapacitated())
-		user << "<span class='warning'>You can't do that right now!</span>"
-		return
-	if(!current_skin && loc == user)
-		reskin_mask(user)
-
-/obj/item/clothing/mask/gas/yautja
-	name = "clan mask"
-	desc = "A beautifully designed metallic face mask. Both decorative and functional."
-	icon_state = "pred_mask"
-	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
-	item_state = "pred_mask"
-	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
-	burn_state = LAVA_PROOF
-	armor = list(melee = 50, bullet = 50, laser = 50,energy = 50, bomb = 50, bio = 80, rad = 50)
-	var/list/options = list()
-	var/current_skin = ""
-
-/obj/item/clothing/mask/gas/yautja/New()
-	options["Jawbone"] = "jaw"
-	options["Plain"]   = "plain"
-	options["Horned"]  = "horn"
-	options["Winged"]  = "wing"
-	options["Cancel"]  = null
-
-/obj/item/clothing/mask/gas/yautja/proc/reskin_mask(mob/M)
-	var/choice = input(M,"Warning, you can only reskin your mask once!","Reskin Mask") in options
-
-	if(src && choice && !current_skin && !M.incapacitated() && in_range(M,src))
-		if(options[choice] == null)
-			return
-		current_skin = options[choice]
-		icon_state = "[initial(icon_state)]_[current_skin]"
-		item_state = "[initial(item_state)]_[current_skin]"
-		M << "Your mask is now skinned as \"[choice]\"."
-		update_icon()
-		M.regenerate_icons()
-
-/obj/item/clothing/mask/gas/yautja/AltClick(mob/user)
-	..()
-	if(user.incapacitated())
-		user << "<span class='warning'>You can't do that right now!</span>"
-		return
-	if(!current_skin && loc == user)
-		reskin_mask(user)
-
-/obj/item/clothing/mask/gas/yautja/examine(mob/user)
-	..()
-	if(!current_skin)
-		user << "<span class='notice'>Alt-click [src.name] to reskin it.</span>"

code/modules/clothing/masks/hailer.dm

@@ -8,7 +8,7 @@
 	icon_state = "sechailer"
 	flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
 	flags_inv = HIDEFACIALHAIR|HIDEFACE
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
 	visor_flags_inv = HIDEFACE
 	flags_cover = MASKCOVERSMOUTH
@@ -17,6 +17,7 @@
 	var/cooldown_special
 	var/recent_uses = 0
 	var/broken_hailer = 0
+	var/safety = TRUE
 
 /obj/item/clothing/mask/gas/sechailer/swat
 	name = "\improper SWAT mask"
@@ -56,20 +57,26 @@
 	else
 		..()
 
-/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, actiontype)
-	if(actiontype == /datum/action/item_action/halt)
+/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action)
+	if(istype(action, /datum/action/item_action/halt))
 		halt()
 	else
 		adjustmask(user)
 
 /obj/item/clothing/mask/gas/sechailer/attack_self()
 	halt()
+/obj/item/clothing/mask/gas/sechailer/emag_act(mob/user as mob)
+	if(safety)
+		safety = FALSE
+		user << "<span class='warning'>You silently fry [src]'s vocal circuit with the cryptographic sequencer."
+	else
+		return
 
 /obj/item/clothing/mask/gas/sechailer/verb/halt()
 	set category = "Object"
 	set name = "HALT"
 	set src in usr
-	if(!istype(usr, /mob/living))
+	if(!isliving(usr))
 		return
 	if(!can_use(usr))
 		return
@@ -107,61 +114,66 @@
 			if(4)
 				phrase = rand(12,18)	// user has broke the restrictor, it will now only play shitcurity phrases
 
-		switch(phrase)	//sets the properties of the chosen phrase
-			if(1)				// good cop
-				phrase_text = "HALT! HALT! HALT!"
-				phrase_sound = "halt"
-			if(2)
-				phrase_text = "Stop in the name of the Law."
-				phrase_sound = "bobby"
-			if(3)
-				phrase_text = "Compliance is in your best interest."
-				phrase_sound = "compliance"
-			if(4)
-				phrase_text = "Prepare for justice!"
-				phrase_sound = "justice"
-			if(5)
-				phrase_text = "Running will only increase your sentence."
-				phrase_sound = "running"
-			if(6)				// bad cop
-				phrase_text = "Don't move, Creep!"
-				phrase_sound = "dontmove"
-			if(7)
-				phrase_text = "Down on the floor, Creep!"
-				phrase_sound = "floor"
-			if(8)
-				phrase_text = "Dead or alive you're coming with me."
-				phrase_sound = "robocop"
-			if(9)
-				phrase_text = "God made today for the crooks we could not catch yesterday."
-				phrase_sound = "god"
-			if(10)
-				phrase_text = "Freeze, Scum Bag!"
-				phrase_sound = "freeze"
-			if(11)
-				phrase_text = "Stop right there, criminal scum!"
-				phrase_sound = "imperial"
-			if(12)				// LA-PD
-				phrase_text = "Stop or I'll bash you."
-				phrase_sound = "bash"
-			if(13)
-				phrase_text = "Go ahead, make my day."
-				phrase_sound = "harry"
-			if(14)
-				phrase_text = "Stop breaking the law, ass hole."
-				phrase_sound = "asshole"
-			if(15)
-				phrase_text = "You have the right to shut the fuck up."
-				phrase_sound = "stfu"
-			if(16)
-				phrase_text = "Shut up crime!"
-				phrase_sound = "shutup"
-			if(17)
-				phrase_text = "Face the wrath of the golden bolt."
-				phrase_sound = "super"
-			if(18)
-				phrase_text = "I am, the LAW!"
-				phrase_sound = "dredd"
+		if(!safety)
+			phrase_text = "FUCK YOUR CUNT YOU SHIT EATING COCKSTORM AND EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND POO AND SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT."
+			phrase_sound = "emag"
+		else
+
+			switch(phrase)	//sets the properties of the chosen phrase
+				if(1)				// good cop
+					phrase_text = "HALT! HALT! HALT!"
+					phrase_sound = "halt"
+				if(2)
+					phrase_text = "Stop in the name of the Law."
+					phrase_sound = "bobby"
+				if(3)
+					phrase_text = "Compliance is in your best interest."
+					phrase_sound = "compliance"
+				if(4)
+					phrase_text = "Prepare for justice!"
+					phrase_sound = "justice"
+				if(5)
+					phrase_text = "Running will only increase your sentence."
+					phrase_sound = "running"
+				if(6)				// bad cop
+					phrase_text = "Don't move, Creep!"
+					phrase_sound = "dontmove"
+				if(7)
+					phrase_text = "Down on the floor, Creep!"
+					phrase_sound = "floor"
+				if(8)
+					phrase_text = "Dead or alive you're coming with me."
+					phrase_sound = "robocop"
+				if(9)
+					phrase_text = "God made today for the crooks we could not catch yesterday."
+					phrase_sound = "god"
+				if(10)
+					phrase_text = "Freeze, Scum Bag!"
+					phrase_sound = "freeze"
+				if(11)
+					phrase_text = "Stop right there, criminal scum!"
+					phrase_sound = "imperial"
+				if(12)				// LA-PD
+					phrase_text = "Stop or I'll bash you."
+					phrase_sound = "bash"
+				if(13)
+					phrase_text = "Go ahead, make my day."
+					phrase_sound = "harry"
+				if(14)
+					phrase_text = "Stop breaking the law, ass hole."
+					phrase_sound = "asshole"
+				if(15)
+					phrase_text = "You have the right to shut the fuck up."
+					phrase_sound = "stfu"
+				if(16)
+					phrase_text = "Shut up crime!"
+					phrase_sound = "shutup"
+				if(17)
+					phrase_text = "Face the wrath of the golden bolt."
+					phrase_sound = "super"
+				if(18)
+					phrase_text = "I am, the LAW!"
+					phrase_sound = "dredd"
 
 		usr.audible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[phrase_text]</b></font>")
 		playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4)

code/modules/clothing/masks/miscellaneous.dm

@@ -4,7 +4,7 @@
 	icon_state = "muzzle"
 	item_state = "blindfold"
 	flags_cover = MASKCOVERSMOUTH
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.90
 	put_on_delay = 20
 
@@ -21,14 +21,14 @@
 	desc = "A sterile mask designed to help prevent the spread of diseases."
 	icon_state = "sterile"
 	item_state = "sterile"
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	flags_inv = HIDEFACE
 	flags_cover = MASKCOVERSMOUTH
 	visor_flags_inv = HIDEFACE
 	visor_flags_cover = MASKCOVERSMOUTH
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.01
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0, fire = 0, acid = 0)
 	actions_types = list(/datum/action/item_action/adjust)
 
 /obj/item/clothing/mask/surgical/attack_self(mob/user)
@@ -40,13 +40,18 @@
 	icon_state = "fake-moustache"
 	flags_inv = HIDEFACE
 
+/obj/item/clothing/mask/joy
+	name = "joy mask"
+	desc = "Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout."
+	icon_state = "joy"
+
 /obj/item/clothing/mask/pig
 	name = "pig mask"
 	desc = "A rubber pig mask."
 	icon_state = "pig"
 	item_state = "pig"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/toggle_voice_box)
 	var/voicechange = 0
 
@@ -65,7 +70,7 @@
 	icon_state = "pig"
 	item_state = "pig"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	var/voicechange = 1
 
 /obj/item/clothing/mask/spig/speechModification(message)
@@ -80,7 +85,7 @@
 	icon_state = "cowmask"
 	item_state = "cowmask"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	var/voicechange = 1
 
 /obj/item/clothing/mask/cowmask/speechModification(message)
@@ -94,7 +99,7 @@
 	icon_state = "horsehead"
 	item_state = "horsehead"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS
-	w_class = 2
+	w_class = WEIGHT_CLASS_SMALL
 	var/voicechange = 1
 
 /obj/item/clothing/mask/horsehead/speechModification(message)
@@ -102,10 +107,60 @@
 		message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
 	return message
 
+/obj/item/clothing/mask/rat
+	name = "rat mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a rat."
+	icon_state = "rat"
+	item_state = "rat"
+	flags_inv = HIDEFACE
+	flags_cover = MASKCOVERSMOUTH
+
+/obj/item/clothing/mask/rat/fox
+	name = "fox mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a fox."
+	icon_state = "fox"
+	item_state = "fox"
+
+/obj/item/clothing/mask/rat/bee
+	name = "bee mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a bee."
+	icon_state = "bee"
+	item_state = "bee"
+
+/obj/item/clothing/mask/rat/bear
+	name = "bear mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a bear."
+	icon_state = "bear"
+	item_state = "bear"
+
+/obj/item/clothing/mask/rat/bat
+	name = "bat mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a bat."
+	icon_state = "bat"
+	item_state = "bat"
+
+/obj/item/clothing/mask/rat/raven
+	name = "raven mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a raven."
+	icon_state = "raven"
+	item_state = "raven"
+
+/obj/item/clothing/mask/rat/jackal
+	name = "jackal mask"
+	desc = "A mask made of soft vinyl and latex, representing the head of a jackal."
+	icon_state = "jackal"
+	item_state = "jackal"
+
+/obj/item/clothing/mask/rat/tribal
+	name = "tribal mask"
+	desc = "A mask carved out of wood, detailed carefully by hand."
+	icon_state = "bumba"
+	item_state = "bumba"
+
 /obj/item/clothing/mask/bandana
 	name = "botany bandana"
 	desc = "A fine bandana with nanotech lining and a hydroponics pattern."
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	flags_cover = MASKCOVERSMOUTH
 	flags_inv = HIDEFACE|HIDEFACIALHAIR
 	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR