diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index a194fa041a6..6d43dda9e6b 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -3709,7 +3709,7 @@ "sK" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/item/clothing/shoes/sneakers/brown, -/obj/item/clothing/head/helmet/police{ +/obj/item/clothing/head/warden/police{ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 15, "bio" = 0, "fire" = 20, "acid" = 20); desc = "I am the law!" }, diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index f494a0f6f8b..e4473d0b265 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -74,7 +74,7 @@ uniform = /obj/item/clothing/under/rank/security/officer/spacepol suit = /obj/item/clothing/suit/armor/vest/blueshirt belt = /obj/item/gun/ballistic/automatic/pistol/m1911 - head = /obj/item/clothing/head/helmet/police + head = /obj/item/clothing/head/warden/police gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/jackboots mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 0dbd59666bd..f1e4ddf9564 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -191,12 +191,6 @@ resistance_flags = FIRE_PROOF | ACID_PROOF dog_fashion = null -/obj/item/clothing/head/helmet/police - name = "police officer's hat" - desc = "A police officer's Hat. This hat emphasizes that you are THE LAW." - icon_state = "policehelm" - - /obj/item/clothing/head/helmet/swat/nanotrasen name = "\improper SWAT helmet" desc = "An extremely robust helmet with the Nanotrasen logo emblazoned on the top." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 391d1b1b02f..afe845925b6 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -177,6 +177,10 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/warden +/obj/item/clothing/head/warden/police + name = "police officer's hat" + desc = "A police officer's hat. This hat emphasizes that you are THE LAW." + /obj/item/clothing/head/warden/red name = "warden's hat" desc = "A warden's red hat. Looking at it gives you the feeling of wanting to keep people in cells for as long as possible." diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index e087b23f288..03effbd39fe 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -436,7 +436,7 @@ suit_store = null back = /obj/item/storage/backpack/ert/security backpack_contents = list( - /obj/item/clothing/head/helmet/police = 1, + /obj/item/clothing/head/warden/police = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/survival/engineer = 1, ) diff --git a/tools/UpdatePaths/Scripts/station_gravity_removal.txt b/tools/UpdatePaths/Scripts/67586_station_gravity_removal.txt similarity index 100% rename from tools/UpdatePaths/Scripts/station_gravity_removal.txt rename to tools/UpdatePaths/Scripts/67586_station_gravity_removal.txt diff --git a/tools/UpdatePaths/Scripts/69643_police_hat.txt b/tools/UpdatePaths/Scripts/69643_police_hat.txt new file mode 100644 index 00000000000..d1fa1fb339b --- /dev/null +++ b/tools/UpdatePaths/Scripts/69643_police_hat.txt @@ -0,0 +1 @@ +/obj/item/clothing/head/helmet/police : /obj/item/clothing/head/warden/police{@old}