diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 0342c0a4018..dc2f870ac34 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -314,7 +314,7 @@ "agb" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/securehallway) "agc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/security/securehallway) "agd" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{level = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/wall,/area/security/podbay) -"age" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table/reinforced,/obj/item/clothing/suit/jacket,/obj/item/clothing/head/beret/sec,/obj/machinery/light_switch{pixel_x = -25},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/podbay) +"age" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table/reinforced,/obj/item/clothing/suit/jacket/pilot,/obj/item/clothing/head/beret/sec,/obj/machinery/light_switch{pixel_x = -25},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/podbay) "agf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/podbay) "agg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/podbay) "agh" = (/obj/structure/closet/secure_closet/security,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Security Podbay APC"; pixel_x = 25},/obj/item/device/spacepod_equipment/weaponry/laser,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/podbay) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 9fe84dba496..abcded54f1f 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -244,7 +244,7 @@ if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) - H.equip_or_collect(new /obj/item/clothing/suit/jacket(H), slot_wear_suit) + H.equip_or_collect(new /obj/item/clothing/suit/jacket/pilot(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8e3f5cf9b3f..536f489dbd9 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -255,6 +255,7 @@ BLIND // can't see anything set src in usr set_sensors(usr) ..() + //Head /obj/item/clothing/head name = "head" @@ -410,9 +411,51 @@ BLIND // can't see anything name = "suit" var/fire_resist = T0C+100 allowed = list(/obj/item/weapon/tank/emergency_oxygen) - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING var/blood_overlay_type = "suit" + var/suit_adjusted = 0 + var/ignore_suitadjust = 1 + var/adjust_flavour = null + +//Proc that opens and closes jackets. +/obj/item/clothing/suit/proc/adjustsuit(var/mob/user) + if(!ignore_suitadjust) + if(!user.canmove || user.stat || user.restrained()) + return + if(suit_adjusted) + var/flavour = "close" + icon_state = initial(icon_state) + item_state = initial(item_state) + if(adjust_flavour) + flavour = "[copytext(adjust_flavour, 3, lentext(adjust_flavour) + 1)] up" //Trims off the 'un' at the beginning of the word. unzip -> zip, unbutton->button. + user << "You [flavour] \the [src]." + suit_adjusted = 0 //Suit is no longer adjusted. + else + var/flavour = "close" + icon_state += "_open" + item_state += "_open" + if(adjust_flavour) + flavour = "[adjust_flavour]" + user << "You [flavour] \the [src]." + suit_adjusted = 1 //Suit's adjusted. + + usr.update_inv_wear_suit() + else + usr << "You attempt to button up the velcro on \the [src], before promptly realising how retarded you are." + +/obj/item/clothing/suit/verb/openjacket(var/mob/user) + set name = "Open/Close Jacket" + set category = "Object" + set src in usr + if(!istype(usr, /mob/living)) return + if(usr.stat) return + adjustsuit(user) + +/obj/item/clothing/suit/ui_action_click() //This is what happens when you click the HUD action button to adjust your suit. + if(!ignore_suitadjust) + adjustsuit(usr) + else ..() //This is required in order to ensure that the UI buttons for hardsuits (i.e. syndicate and the chronosuit) and the RD's RA vest still work. //Spacesuit //Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together. diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a6a8ad4b244..6ae799396e0 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -70,23 +70,9 @@ icon_state = "hostrench" item_state = "hostrench" flags_inv = 0 - - verb/toggle() - set name = "Toggle Trenchcoat Buttons" - set category = "Object" - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - if(icon_state == "hostrench") - icon_state = "hostrench_button" - item_state = "hostrench_button" - usr<< "You button the [src]." - else - icon_state = "hostrench" - item_state = "hostrench" - usr<< "You unbutton the [src]." - - usr.update_inv_wear_suit() + ignore_suitadjust = 0 + action_button_name = "Open/Close Trenchcoat" + adjust_flavour = "unbutton" /obj/item/clothing/suit/armor/hos/jensen name = "armored trenchcoat" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 78820a130dc..c9a4f9e296f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -97,7 +97,7 @@ //Chef /obj/item/clothing/suit/chef - name = "Chef's apron" + name = "chef's apron" desc = "An apron used by a high class chef." icon_state = "chef" item_state = "chef" @@ -112,7 +112,7 @@ //Chef /obj/item/clothing/suit/chef/classic - name = "A classic chef's apron." + name = "classic chef's apron" desc = "A basic, dull, white chef's apron." icon_state = "apronchef" item_state = "apronchef" @@ -190,23 +190,29 @@ //Lawyer /obj/item/clothing/suit/storage/lawyer/blackjacket - name = "Black Suit Jacket" + name = "black suit jacket" desc = "A snappy dress jacket." - icon_state = "suitjacket_black_open" - item_state = "suitjacket_black_open" + icon_state = "suitjacket_black" + item_state = "suitjacket_black" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS + ignore_suitadjust = 0 + action_button_name = "Button/Unbutton Jacket" + adjust_flavour = "unbutton" /obj/item/clothing/suit/storage/lawyer/bluejacket - name = "Blue Suit Jacket" + name = "blue suit jacket" desc = "A snappy dress jacket." - icon_state = "suitjacket_blue_open" - item_state = "suitjacket_blue_open" + icon_state = "suitjacket_blue" + item_state = "suitjacket_blue" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS + ignore_suitadjust = 0 + action_button_name = "Button/Unbutton Jacket" + adjust_flavour = "unbutton" /obj/item/clothing/suit/storage/lawyer/purpjacket - name = "Purple Suit Jacket" + name = "purple suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_purp" item_state = "suitjacket_purp" @@ -215,87 +221,39 @@ //Internal Affairs /obj/item/clothing/suit/storage/internalaffairs - name = "Internal Affairs Jacket" + name = "\improper Internal Affairs jacket" desc = "A smooth black jacket." - icon_state = "ia_jacket_open" + icon_state = "ia_jacket" item_state = "ia_jacket" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - - verb/toggle() - set name = "Toggle Coat Buttons" - set category = "Object" - set src in usr - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - - switch(icon_state) - if("ia_jacket_open") - src.icon_state = "ia_jacket" - usr << "You button up the jacket." - if("ia_jacket") - src.icon_state = "ia_jacket_open" - usr << "You unbutton the jacket." - else - usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." - return - usr.update_inv_wear_suit() //so our overlays update + ignore_suitadjust = 0 + action_button_name = "Button/Unbutton Jacket" + adjust_flavour = "unbutton" /obj/item/clothing/suit/storage/ntrep - name = "NanoTrasen Representative Jacket" + name = "\improper NanoTrasen Representative jacket" desc = "A fancy black jacket, standard issue to NanoTrasen Represenatives." icon_state = "ntrep" item_state = "ia_jacket" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - - verb/toggle() - set name = "Toggle Coat Buttons" - set category = "Object" - set src in usr - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - - switch(icon_state) - if("ntrep_open") - src.icon_state = "ntrep" - usr << "You button up the jacket." - if("ntrep") - src.icon_state = "ntrep_open" - usr << "You unbutton the jacket." - else - usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." - return - usr.update_inv_wear_suit() //so our overlays update + ignore_suitadjust = 0 + action_button_name = "Button/Unbutton Jacket" + adjust_flavour = "unbutton" //Medical /obj/item/clothing/suit/storage/fr_jacket name = "first responder jacket" desc = "A high-visibility jacket worn by medical first responders." - icon_state = "fr_jacket_open" + icon_state = "fr_jacket" item_state = "fr_jacket" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \ /obj/item/device/healthanalyzer, /obj/item/device/antibody_scanner, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen,/obj/item/device/rad_laser) - - verb/toggle() - set name = "Toggle Jacket Buttons" - set category = "Object" - set src in usr - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - - switch(icon_state) - if("fr_jacket_open") - src.icon_state = "fr_jacket" - usr << "You button up the jacket." - if("fr_jacket") - src.icon_state = "fr_jacket_open" - usr << "You unbutton the jacket." - usr.update_inv_wear_suit() //so our overlays update + ignore_suitadjust = 0 + action_button_name = "Button/Unbutton Jacket" + adjust_flavour = "unbutton" //Mime /obj/item/clothing/suit/suspenders diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index bad3378da22..483df131a0f 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -3,76 +3,17 @@ desc = "A suit that protects against minor chemical spills." icon_state = "labcoat_open" item_state = "labcoat" + ignore_suitadjust = 0 blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/device/antibody_scanner,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper,/obj/item/device/rad_laser) - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0) species_fit = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi' ) - - verb/toggle() - set name = "Toggle Labcoat Buttons" - set category = "Object" - set src in usr - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - - switch(icon_state) - if("labcoat_open") - src.icon_state = "labcoat" - usr << "You button up the labcoat." - if("labcoat") - src.icon_state = "labcoat_open" - usr << "You unbutton the labcoat." - if("labcoat_cmo_open") - src.icon_state = "labcoat_cmo" - usr << "You button up the labcoat." - if("labcoat_cmo") - src.icon_state = "labcoat_cmo_open" - usr << "You unbutton the labcoat." - if("labcoat_gen_open") - src.icon_state = "labcoat_gen" - usr << "You button up the labcoat." - if("labcoat_gen") - src.icon_state = "labcoat_gen_open" - usr << "You unbutton the labcoat." - if("labcoat_chem_open") - src.icon_state = "labcoat_chem" - usr << "You button up the labcoat." - if("labcoat_chem") - src.icon_state = "labcoat_chem_open" - usr << "You unbutton the labcoat." - if("labcoat_vir_open") - src.icon_state = "labcoat_vir" - usr << "You button up the labcoat." - if("labcoat_vir") - src.icon_state = "labcoat_vir_open" - usr << "You unbutton the labcoat." - if("labcoat_tox_open") - src.icon_state = "labcoat_tox" - usr << "You button up the labcoat." - if("labcoat_tox") - src.icon_state = "labcoat_tox_open" - usr << "You unbutton the labcoat." - if("labgreen_open") - src.icon_state = "labgreen" - usr << "You button up the labcoat." - if("labgreen") - src.icon_state = "labgreen_open" - usr << "You unbutton the labcoat." - if("labcoat_mort_open") - src.icon_state = "labcoat_mort" - usr << "You button up the labcoat." - if("labcoat_mort") - src.icon_state = "labcoat_mort_open" - usr << "You unbutton the labcoat." - else - usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." - return - usr.update_inv_wear_suit() //so our overlays update + action_button_name = "Button/Unbutton Labcoat" + adjust_flavour = "unbutton" /obj/item/clothing/suit/storage/labcoat/cmo name = "chief medical officer's labcoat" @@ -85,7 +26,7 @@ ) /obj/item/clothing/suit/storage/labcoat/mad - name = "The Mad Scientist's labcoat" + name = "mad scientist's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labcoat_green_open" item_state = "labcoat_green" @@ -95,7 +36,7 @@ ) /obj/item/clothing/suit/storage/labcoat/genetics - name = "Geneticist Labcoat" + name = "geneticist labcoat" desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." icon_state = "labcoat_gen_open" species_fit = list("Vox") @@ -104,7 +45,7 @@ ) /obj/item/clothing/suit/storage/labcoat/chemist - name = "Chemist Labcoat" + name = "chemist labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem_open" species_fit = list("Vox") @@ -113,7 +54,7 @@ ) /obj/item/clothing/suit/storage/labcoat/virologist - name = "Virologist Labcoat" + name = "virologist labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." icon_state = "labcoat_vir_open" species_fit = list("Vox") @@ -122,7 +63,7 @@ ) /obj/item/clothing/suit/storage/labcoat/science - name = "Scientist Labcoat" + name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_tox_open" species_fit = list("Vox") @@ -131,7 +72,7 @@ ) /obj/item/clothing/suit/storage/labcoat/mortician - name = "Coroner Labcoat" + name = "coroner labcoat" desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder." icon_state = "labcoat_mort_open" species_fit = list("Vox") diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 52d3065241d..c57c957373a 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -10,7 +10,7 @@ */ /obj/item/clothing/suit/bluetag name = "blue laser tag armour" - desc = "Blue Pride, Station Wide" + desc = "Blue Pride, Station Wide." icon_state = "bluetag" item_state = "bluetag" blood_overlay_type = "armor" @@ -19,7 +19,7 @@ /obj/item/clothing/suit/redtag name = "red laser tag armour" - desc = "Pew pew pew" + desc = "Pew pew pew." icon_state = "redtag" item_state = "redtag" blood_overlay_type = "armor" @@ -62,7 +62,7 @@ /obj/item/clothing/suit/greatcoat name = "great coat" - desc = "A Nazi great coat" + desc = "A Nazi great coat." icon_state = "nazi" item_state = "nazi" @@ -120,8 +120,8 @@ /obj/item/clothing/suit/hastur - name = "Hastur's Robes" - desc = "Robes not meant to be worn by man" + name = "Hastur's robes" + desc = "Robes not meant to be worn by man." icon_state = "hastur" item_state = "hastur" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -129,8 +129,8 @@ /obj/item/clothing/suit/imperium_monk - name = "Imperium monk" - desc = "Have YOU killed a xenos today?" + name = "imperium monk" + desc = "Have YOU killed a xeno today?" icon_state = "imperium_monk" item_state = "imperium_monk" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -138,7 +138,7 @@ allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) /obj/item/clothing/suit/chickensuit - name = "Chicken Suit" + name = "chicken suit" desc = "A suit made long ago by the ancient empire KFC." icon_state = "chickensuit" item_state = "chickensuit" @@ -146,7 +146,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/corgisuit - name = "Corgi Suit" + name = "corgi suit" desc = "A suit made long ago by the ancient empire KFC." icon_state = "corgisuit" item_state = "chickensuit" @@ -155,7 +155,7 @@ flags = NODROP /obj/item/clothing/suit/corgisuit/en - name = "E-N Suit" + name = "\improper E-N suit" icon_state = "ensuit" /obj/item/clothing/suit/corgisuit/en/New() @@ -174,7 +174,7 @@ step_towards(M,src) /obj/item/clothing/suit/monkeysuit - name = "Monkey Suit" + name = "monkey suit" desc = "A suit that looks like a primate" icon_state = "monkeysuit" item_state = "monkeysuit" @@ -183,7 +183,7 @@ /obj/item/clothing/suit/holidaypriest - name = "Holiday Priest" + name = "holiday priest" desc = "This is a nice holiday my son." icon_state = "holidaypriest" item_state = "holidaypriest" @@ -244,28 +244,6 @@ icon_state = "ianshirt" item_state = "ianshirt" -//Blue suit jacket toggle -/obj/item/clothing/suit/suit/verb/toggle() - set name = "Toggle Jacket Buttons" - set category = "Object" - set src in usr - - if(!usr.canmove || usr.stat || usr.restrained()) - return 0 - - if(src.icon_state == "suitjacket_blue_open") - src.icon_state = "suitjacket_blue" - src.item_state = "suitjacket_blue" - usr << "You button up the suit jacket." - else if(src.icon_state == "suitjacket_blue") - src.icon_state = "suitjacket_blue_open" - src.item_state = "suitjacket_blue_open" - usr << "You unbutton the suit jacket." - else - usr << "You button-up some imaginary buttons on your [src]." - return - usr.update_inv_wear_suit() - //pyjamas //originally intended to be pinstripes >.> @@ -406,8 +384,8 @@ item_color = "swim_red" /obj/item/clothing/suit/storage/mercy_hoodie - name = "Mercy Robe" - desc = " A soft white robe made of a synthetic fiber that provides improved protection against biohazards. Possessing multiple overlapping layers, yet light enough to allow complete freedom of movement, it denotes its wearer as a master physician." + name = "mercy robe" + desc = "A soft white robe made of a synthetic fiber that provides improved protection against biohazards. Possessing multiple overlapping layers, yet light enough to allow complete freedom of movement, it denotes its wearer as a master physician." icon_state = "mercy_hoodie" item_state = "mercy_hoodie" w_class = 4//bulky item @@ -434,14 +412,36 @@ desc = "Aviators not included." icon_state = "bomber" item_state = "bomber" + ignore_suitadjust = 0 allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + action_button_name = "Zip/Unzip Jacket" + adjust_flavour = "unzip" + +/obj/item/clothing/suit/jacket/pilot + name = "security bomber jacket" + desc = "A stylish and worn-in armoured black bomber jacket emblazoned with the NT Security crest on the left breast. Looks rugged." + icon_state = "bombersec" + item_state = "bombersec" + ignore_suitadjust = 0 + //Inherited from Security armour. + allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/weapon/kitchen/knife/combat) + heat_protection = UPPER_TORSO|LOWER_TORSO + min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT + max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT + strip_delay = 60 + put_on_delay = 40 + flags = ONESIZEFITSALL + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + //End of inheritance from Security armour. /obj/item/clothing/suit/jacket/leather name = "leather jacket" desc = "Pompadour not included." icon_state = "leatherjacket" + ignore_suitadjust = 1 + adjust_flavour = null /obj/item/clothing/suit/officercoat name = "Clown Officer's Coat" diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 0ac8cffa837..88383fd5da8 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 988f0153964..f4b8895a5de 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ