Toggle mask code by Gaben/Spamcat. Custom items for staghorn and atmoicdog29. Airlock electronic fixes for research doors.

code/game/machinery/doors/airlock.dm

@@ -419,6 +419,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 						if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )	//issue 301 -mysthic
 						if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
 						if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
+						if(21) new/obj/structure/door_assembly/door_assembly_research( src.loc )
 					var/obj/item/weapon/airlock_electronics/ae
 					if (!electronics)
 						ae = new/obj/item/weapon/airlock_electronics( src.loc )

code/game/machinery/doors/airlock_electronics.dm

@@ -86,7 +86,7 @@
 
 		if (href_list["style"])
 			style_name = input("Select the door's paint scheme.", "Door Style", style_name) in \
-				list("General", "Command", "Security", "Engineering", "Medical", "Maintenance", "Airlock", "Freezer")
+				list("General", "Command", "Security", "Engineering", "Medical", "Maintenance", "Airlock", "Freezer", "Research")
 
 			switch(style_name)
 				if("General")
@@ -105,6 +105,8 @@
 					style = /obj/structure/door_assembly/door_assembly_ext
 				if("Freezer")
 					style = /obj/structure/door_assembly/door_assembly_fre
+				if("Research")
+					style = /obj/structure/door_assembly/door_assembly_research
 
 		attack_self(usr)
 

code/game/objects/items/clothing.dm

@@ -410,7 +410,6 @@ THERMAL GLASSES
 		src.item_state = "ushankadown"
 		user << "You lower the ear flaps on the ushanka."
 
-
 /obj/item/clothing/glasses/thermal/emp_act(severity)
 	if(istype(src.loc, /mob/living/carbon/human))
 		var/mob/living/carbon/human/M = src.loc
@@ -429,18 +428,19 @@ THERMAL GLASSES
 /obj/item/clothing/head/helmet/space/rig/engspace_helmet/verb/toggle()
 	set category = "Object"
 	set name = "Toggle Helmet Visor"
-	if(src.up)
-		src.up = !src.up
-		src.see_face = !src.see_face
-		src.flags |= HEADCOVERSEYES
-		icon_state = "engspace_helmet"
-		usr << "You toggle the reflective tint on."
-	else
-		src.up = !src.up
-		src.see_face = !src.see_face
-		src.flags &= ~HEADCOVERSEYES
-		icon_state = "engspace_helmet_clear"
-		usr << "You toggle the reflective tint off."
+	if(usr.canmove && usr.stat != 2 && !usr.restrained())
+		if(src.up)
+			src.up = !src.up
+			src.see_face = !src.see_face
+			src.flags |= HEADCOVERSEYES
+			icon_state = "engspace_helmet"
+			usr << "You toggle the reflective tint on."
+		else
+			src.up = !src.up
+			src.see_face = !src.see_face
+			src.flags &= ~HEADCOVERSEYES
+			icon_state = "engspace_helmet_clear"
+			usr << "You toggle the reflective tint off."
 	usr.update_clothing()
 
 /obj/item/clothing/head/helmet/space/rig/cespace_helmet/attack_self()
@@ -449,17 +449,38 @@ THERMAL GLASSES
 /obj/item/clothing/head/helmet/space/rig/cespace_helmet/verb/toggle()
 	set category = "Object"
 	set name = "Toggle Helmet Visor"
-	if(src.up)
-		src.up = !src.up
-		src.see_face = !src.see_face
-		src.flags |= HEADCOVERSEYES
-		icon_state = "cespace_helmet"
-		usr << "You toggle the reflective tint on."
-	else
-		src.up = !src.up
-		src.see_face = !src.see_face
-		src.flags &= ~HEADCOVERSEYES
-		icon_state = "cespace_helmet_clear"
-		usr << "You toggle the reflective tint off."
+	if(usr.canmove && usr.stat != 2 && !usr.restrained())
+		if(src.up)
+			src.up = !src.up
+			src.see_face = !src.see_face
+			src.flags |= HEADCOVERSEYES
+			icon_state = "cespace_helmet"
+			usr << "You toggle the reflective tint on."
+		else
+			src.up = !src.up
+			src.see_face = !src.see_face
+			src.flags &= ~HEADCOVERSEYES
+			icon_state = "cespace_helmet_clear"
+			usr << "You toggle the reflective tint off."
 	usr.update_clothing()
 
+/obj/item/clothing/mask/breath/verb/toggle()
+	set name = "Adjust Mask"
+	set category = "Object"
+	if(usr.canmove && usr.stat != 2 && !usr.restrained())
+		if(src.icon_state == "medical")
+			usr << "You can't seem to adjust this mask."
+			return
+		if(src.icon_state == "breath_low")
+			src.icon_state = "breath"
+			src.item_state = "breath"
+			src.flags |= SUITSPACE|HEADSPACE|MASKCOVERSMOUTH
+			protective_temperature = 420
+			usr << "You are now breathing through your mask."
+		else if(src.icon_state == "breath")
+			src.icon_state = "breath_low"
+			src.item_state = "breath_low"
+			src.flags &= ~(SUITSPACE|HEADSPACE|MASKCOVERSMOUTH)
+			protective_temperature = 270
+			usr << "Your mask is now hanging on your neck."
+	usr.update_clothing()

code/modules/customitems/item_defines.dm

@@ -192,6 +192,14 @@
 	item_state = "graycoat"
 	color = "graycoat"
 
+/obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
+	name = "leather jacket"
+	desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum."
+	icon = 'custom_items.dmi'
+	icon_state = "leatherjack"
+	item_state = "leatherjack"
+	color = "leatherjack"
+
 //////////// Uniforms ////////////
 
 /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda
@@ -221,15 +229,15 @@
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
-/*
-/obj/item/clothing/mask/mara_kilpatrick_1
+
+/obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick
 	name = "shamrock pendant"
 	desc = "A silver and emerald shamrock pendant. It has the initials \"M.K.\" engraved on the back."
 	icon = 'custom_items.dmi'
 	icon_state = "mara_kilpatrick_1"
 	flags = FPRINT|TABLEPASS
 	w_class = 1
-*/
+
 //////////// Shoes ////////////
 
 /obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis

config/custom_items.txt

@@ -1,4 +1,5 @@
 asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche, /obj/item/clothing/glasses/meson/fluff/book_berner_1
+atomicdog92: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/leatherjack
 chinsky: Victor Kaminski: /obj/item/fluff/victor_kaminsky_1
 chinsky: Summer Springfield: /obj/item/weapon/camera_test/fluff/orange
 compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
@@ -27,6 +28,7 @@ serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1, /o
 silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
 spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/storage/labcoat/fluff/pink
 sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
+staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
 thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
 themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1