diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index c5a16c3043..065b503954 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -95,7 +95,7 @@ /obj/item/clothing/head/chameleon/Initialize() . = ..() if(!clothing_choices) - var/blocked = list(src.type, /obj/item/clothing/head/justice,)//Prevent infinite loops and bad hats. + var/blocked = list(src.type)//Prevent infinite loops and bad hats. clothing_choices = generate_chameleon_choices(/obj/item/clothing/head, blocked) /obj/item/clothing/head/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 6b3df50ca1..3ea4744b84 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -179,14 +179,14 @@ name = "witch costume wig" desc = "Eeeee~heheheheheheh!" icon_state = "witch" - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR siemens_coefficient = 2.0 /obj/item/clothing/head/collectable/chicken name = "chicken suit head" desc = "Bkaw!" icon_state = "chickenhead" - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR siemens_coefficient = 0.7 body_parts_covered = HEAD|FACE|EYES @@ -195,7 +195,7 @@ desc = "Fuzzy." icon_state = "bearpelt" item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR siemens_coefficient = 0.7 /obj/item/clothing/head/collectable/xenos @@ -212,7 +212,7 @@ desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!" icon_state = "philosopher_wig" item_state_slots = list(slot_r_hand_str = "pwig", slot_l_hand_str = "pwig") - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR siemens_coefficient = 2.0 //why is it so conductive?! body_parts_covered = 0 diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index decd5258d9..c32b48e986 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -4,7 +4,7 @@ icon_state = "generic_hood" body_parts_covered = HEAD cold_protection = HEAD - flags_inv = HIDEEARS | BLOCKHAIR + flags_inv = HIDEEARS | BLOCKHEADHAIR // Winter coats /obj/item/clothing/head/hood/winter diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 56b10c79cb..ec8dcaa308 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -43,7 +43,7 @@ desc = "It's a hood that covers the head. It keeps you warm during the space winters." icon_state = "chaplain_hood" item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR body_parts_covered = HEAD //Chaplain but spookier @@ -216,4 +216,4 @@ /obj/item/clothing/head/surgery/navyblue desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue." icon_state = "surgcap_navyblue" - item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3a3c2dd2e0..8775e2f6a2 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -128,24 +128,6 @@ icon_state = "greenbandana" flags_inv = 0 body_parts_covered = 0 -/obj/item/clothing/head/justice - name = "justice hat" - desc = "fight for what's righteous!" - icon_state = "justicered" //Does this even exist? - flags_inv = BLOCKHAIR - body_parts_covered = HEAD|EYES - -/obj/item/clothing/head/justice/blue - icon_state = "justiceblue" - -/obj/item/clothing/head/justice/yellow - icon_state = "justiceyellow" - -/obj/item/clothing/head/justice/green - icon_state = "justicegreen" - -/obj/item/clothing/head/justice/pink - icon_state = "justicepink" /obj/item/clothing/head/rabbitears name = "rabbit ears" @@ -402,4 +384,4 @@ name = "fish skull" desc = "You... you're not actually going to wear that, right?" icon_state = "fishskull" - flags_inv = HIDEEARS|BLOCKHAIR + flags_inv = HIDEEARS|BLOCKHEADHAIR diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 130e08ebd9..026934f907 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -39,17 +39,6 @@ flags_inv = BLOCKHAIR siemens_coefficient = 0.6 -//how is this a space helmet? -/obj/item/clothing/head/helmet/space/deathsquad/beret - name = "officer's beret" - desc = "An armored beret commonly used by special operations officers." - icon_state = "beret_badge" - item_state_slots = list(slot_r_hand_str = "beret", slot_l_hand_str = "beret") - armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) - item_flags = EMPTY_BITFIELD - flags_inv = BLOCKHAIR - siemens_coefficient = 0.9 - //Space santa outfit suit /obj/item/clothing/head/helmet/space/santahat name = "Santa's hat" @@ -74,7 +63,7 @@ icon_state = "pirate" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) item_flags = EMPTY_BITFIELD - flags_inv = BLOCKHAIR + flags_inv = BLOCKHEADHAIR body_parts_covered = 0 siemens_coefficient = 0.9 diff --git a/code/modules/xenoarcheaology/tools/equipment.dm b/code/modules/xenoarcheaology/tools/equipment.dm index a01240fc28..6de5781480 100644 --- a/code/modules/xenoarcheaology/tools/equipment.dm +++ b/code/modules/xenoarcheaology/tools/equipment.dm @@ -17,6 +17,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100) max_pressure_protection = 5 * ONE_ATMOSPHERE // Not very good protection, but if an anomaly starts doing gas stuff you're not screwed min_pressure_protection = 0.4 * ONE_ATMOSPHERE + flags_inv = HIDEEARS|BLOCKHEADHAIR /obj/item/clothing/suit/space/anomaly name = "Excavation suit" @@ -34,3 +35,4 @@ icon_state = "cespace_helmet" item_state = "cespace_helmet" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + flags_inv = HIDEEARS|BLOCKHEADHAIR diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index 037c6bde86..e496aeebdb 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -4902,11 +4902,6 @@ /obj/item/clothing/head/pin/flower/blue, /obj/item/clothing/head/pin/flower/orange, /obj/item/clothing/head/pin/flower/pink, -/obj/item/clothing/head/justice, -/obj/item/clothing/head/justice/blue, -/obj/item/clothing/head/justice/green, -/obj/item/clothing/head/justice/pink, -/obj/item/clothing/head/justice/yellow, /obj/item/clothing/head/collectable/philosopher_wig, /obj/item/clothing/head/collectable/plaguedoctorhat, /obj/item/clothing/head/collectable/xenos, diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index 1c76e07af1..f7a285787f 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -499,7 +499,7 @@ "jE" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jF" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jG" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jH" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jH" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jI" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/meter,/obj/structure/largecrate/animal/cat,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jJ" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jK" = (/turf/simulated/shuttle/floor/red,/area/syndicate_mothership) diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index 44129553e4..12bdd3b907 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -1294,7 +1294,7 @@ "yT" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yU" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yV" = (/obj/machinery/button/remote/blast_door{id = "trade"; name = "Shop Shutters"; pixel_x = 0; pixel_y = -26},/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) -"yW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/justice,/obj/item/clothing/head/justice/blue,/obj/item/clothing/head/justice/green,/obj/item/clothing/head/justice/pink,/obj/item/clothing/head/justice/yellow,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/collectable/bearpelt,/obj/item/clothing/head/bowler,/obj/item/clothing/head/caphat/cap,/obj/item/clothing/head/beaverhat,/obj/item/clothing/head/beret/centcom,/obj/item/clothing/head/beret/sec,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/kitty,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/rabbitears,/obj/item/clothing/head/collectable/petehat,/obj/item/clothing/head/collectable/pirate,/obj/item/clothing/head/collectable/wizard,/obj/item/clothing/head/collectable/xenom,/obj/item/clothing/head/cowboy_hat,/obj/item/clothing/head/pin/flower/violet,/obj/item/clothing/head/pin/flower/blue,/obj/item/clothing/head/pin/flower/orange,/obj/item/clothing/head/pin/flower/pink,/obj/item/clothing/head/philosopher_wig,/obj/item/clothing/head/plaguedoctorhat,/obj/item/clothing/head/xenos,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yX" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "yY" = (/turf/unsimulated/wall,/area/centcom/terminal) "yZ" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home)