mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
Fix goggles and cadet vests not working (#7320)
Title, fixes cadet vest not being zippable and goggles not being adjustable, fixes #7319
This commit is contained in:
@@ -265,7 +265,7 @@
|
||||
jobtype = /datum/job/intern_sec
|
||||
|
||||
uniform = /obj/item/clothing/under/rank/cadet
|
||||
suit = /obj/item/clothing/suit/storage/vest/cadet
|
||||
suit = /obj/item/clothing/suit/storage/hazardvest/cadet
|
||||
head = /obj/item/clothing/head/beret/sec/cadet
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
l_ear = /obj/item/device/radio/headset/headset_sec
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_sec(src)
|
||||
new /obj/item/clothing/head/beret/sec/cadet(src)
|
||||
new /obj/item/clothing/suit/storage/vest/cadet(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest/cadet(src)
|
||||
new /obj/item/clothing/under/rank/cadet(src)
|
||||
//Tools
|
||||
new /obj/item/device/radio/headset/headset_sec(src)
|
||||
|
||||
@@ -199,23 +199,24 @@ BLIND // can't see anything
|
||||
set src in usr
|
||||
|
||||
if(use_check_and_message(usr))
|
||||
if(src.up)
|
||||
src.up = !src.up
|
||||
flags_inv |= HIDEEYES
|
||||
body_parts_covered |= EYES
|
||||
item_state = initial(item_state)
|
||||
icon_state = initial(item_state)
|
||||
to_chat(usr, span("notice", "You flip \the [src] down to protect your eyes."))
|
||||
else
|
||||
src.up = !src.up
|
||||
flags_inv &= ~HIDEEYES
|
||||
body_parts_covered &= ~EYES
|
||||
item_state = "[initial(item_state)]_up"
|
||||
icon_state = "[initial(icon_state)]_up"
|
||||
to_chat(usr, span("notice", "You push \the [src] up out of your face."))
|
||||
update_clothing_icon()
|
||||
update_icon()
|
||||
usr.update_action_buttons()
|
||||
return
|
||||
if(src.up)
|
||||
src.up = !src.up
|
||||
flags_inv |= HIDEEYES
|
||||
body_parts_covered |= EYES
|
||||
item_state = initial(item_state)
|
||||
icon_state = initial(item_state)
|
||||
to_chat(usr, span("notice", "You flip \the [src] down to protect your eyes."))
|
||||
else
|
||||
src.up = !src.up
|
||||
flags_inv &= ~HIDEEYES
|
||||
body_parts_covered &= ~EYES
|
||||
item_state = "[initial(item_state)]_up"
|
||||
icon_state = "[initial(icon_state)]_up"
|
||||
to_chat(usr, span("notice", "You push \the [src] up out of your face."))
|
||||
update_clothing_icon()
|
||||
update_icon()
|
||||
usr.update_action_buttons()
|
||||
|
||||
/obj/item/clothing/glasses/eyepatch
|
||||
name = "eyepatch"
|
||||
|
||||
@@ -402,12 +402,16 @@
|
||||
icon_badge = "csivest_badge"
|
||||
icon_nobadge = "csivest_nobadge"
|
||||
|
||||
/obj/item/clothing/suit/storage/vest/cadet
|
||||
/obj/item/clothing/suit/storage/hazardvest/cadet
|
||||
name = "cadet hazard vest"
|
||||
desc = "A sturdy high-visibility vest intended for in training security personnel."
|
||||
icon_state = "hazard_cadet"
|
||||
item_state = "hazard_cadet"
|
||||
icon_open = "hazard_cadet_open"
|
||||
icon_closed = "hazard_cadet"
|
||||
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight)
|
||||
armor = list(melee = 10, bullet = 0, laser = 10, energy = 10, bomb = 10, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.5
|
||||
|
||||
/obj/item/clothing/suit/storage/vest/heavy
|
||||
name = "heavy armor vest"
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
author: JohnWildkins
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Sec. cadet hazard vests can now be properly zipped/unzipped."
|
||||
- bugfix: "Safety goggles can now be properly adjusted."
|
||||
Reference in New Issue
Block a user