diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3538777e955..a7df223b95a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/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 ) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 50bd35d0c9d..6e169231e65 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/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) diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index 47176cbca76..76bdf49d2c0 100644 --- a/code/game/objects/items/clothing.dm +++ b/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() \ No newline at end of file diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 99ab5ee3738..b8883074a3e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/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 diff --git a/config/custom_items.txt b/config/custom_items.txt index abe54d2708a..a1b2ac3283e 100644 --- a/config/custom_items.txt +++ b/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 diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 7c39c88907f..78543a4f67e 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 8df2fbebba3..16b5cfb6deb 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index d30f7a36a30..6a9363737df 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d6ed4ed2644..f14330187b4 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 1485cd386d3..19bb14d5564 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 22769d49f7a..ed8b898e390 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ