mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Police hats are now hats instead of helmets. (#69643)
* Fixes police hats covering your hair. Makes police hats a subtype of Warden's hats, so they still are security-level armor, without covering your hair like helmets do. This was gone unnoticed because the item is very limited in-game. I also renamed the gravity generator updatepaths because it's been inconsistent with the rest of the updatepaths for a while now. * renames updatepaths * Update tools/UpdatePaths/Scripts/69643_police_hat.txt Co-authored-by: san7890 <the@san7890.com> * moves the hat to warden's, removes icon state Turns out the icon state is shared between both hats, so the only real difference is name and description... Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
@@ -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!"
|
||||
},
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/obj/item/clothing/head/helmet/police : /obj/item/clothing/head/warden/police{@old}
|
||||
Reference in New Issue
Block a user