cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks path from sechud/toggle to sechud/aviator

Browse Source
This commit is contained in:
Yoshax
2016-10-25 20:40:26 +01:00
parent cf35da203b
commit 11209a5b0e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/loadout/loadout_eyes.dm
View File

@@ -40,12 +40,12 @@
/datum/gear/eyes/secaviators /datum/gear/eyes/secaviators
display_name = "Security HUD Aviators" display_name = "Security HUD Aviators"
path = /obj/item/clothing/glasses/sunglasses/sechud/toggle path = /obj/item/clothing/glasses/sunglasses/sechud/aviator
allowed_roles = list("Security Officer","Head of Security","Warden") allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/eyes/secaviators/prescription /datum/gear/eyes/secaviators/prescription
display_name = "Security HUD Aviators, prescription" display_name = "Security HUD Aviators, prescription"
path = /obj/item/clothing/glasses/sunglasses/sechud/toggle/prescription path = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
allowed_roles = list("Security Officer","Head of Security","Warden") allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/eyes/medical /datum/gear/eyes/medical

13
code/modules/clothing/glasses/glasses.dm
View File

@@ -186,7 +186,6 @@ BLIND // can't see anything
/obj/item/clothing/glasses/welding/attack_self() /obj/item/clothing/glasses/welding/attack_self()
toggle() toggle()
/obj/item/clothing/glasses/welding/verb/toggle() /obj/item/clothing/glasses/welding/verb/toggle()
set category = "Object" set category = "Object"
set name = "Adjust welding goggles" set name = "Adjust welding goggles"
@@ -258,7 +257,7 @@ BLIND // can't see anything
desc = "Flash-resistant goggles with inbuilt combat and security information." desc = "Flash-resistant goggles with inbuilt combat and security information."
icon_state = "swatgoggles" icon_state = "swatgoggles"
/obj/item/clothing/glasses/sunglasses/sechud/toggle /obj/item/clothing/glasses/sunglasses/sechud/aviator
name = "HUD aviators" name = "HUD aviators"
desc = "Modified aviator glasses that can be switch between HUD and flash protection modes." desc = "Modified aviator glasses that can be switch between HUD and flash protection modes."
icon_state = "sec_hud" icon_state = "sec_hud"
@@ -270,17 +269,17 @@ BLIND // can't see anything
var/hud_holder var/hud_holder
/obj/item/clothing/glasses/sunglasses/sechud/toggle/New() /obj/item/clothing/glasses/sunglasses/sechud/aviator/New()
..() ..()
hud_holder = hud hud_holder = hud
/obj/item/clothing/glasses/sunglasses/sechud/toggle/Destroy() /obj/item/clothing/glasses/sunglasses/sechud/aviator/Destroy()
qdel(hud_holder) qdel(hud_holder)
hud_holder = null hud_holder = null
hud = null hud = null
. = ..() . = ..()
/obj/item/clothing/glasses/sunglasses/sechud/toggle/attack_self(mob/user) /obj/item/clothing/glasses/sunglasses/sechud/aviator/attack_self(mob/user)
if(toggleable && !user.incapacitated()) if(toggleable && !user.incapacitated())
on = !on on = !on
if(on) if(on)
@@ -294,13 +293,13 @@ BLIND // can't see anything
user.update_inv_glasses() user.update_inv_glasses()
user.update_action_buttons() user.update_action_buttons()
/obj/item/clothing/glasses/sunglasses/sechud/toggle/update_icon() /obj/item/clothing/glasses/sunglasses/sechud/aviator/update_icon()
if(on) if(on)
icon_state = initial(icon_state) icon_state = initial(icon_state)
else else
icon_state = off_state icon_state = off_state
/obj/item/clothing/glasses/sunglasses/sechud/toggle/prescription /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
name = "Prescription HUD aviators" name = "Prescription HUD aviators"
desc = "Modified aviator glasses that can be switch between HUD and flash protection modes. Comes with bonus prescription lenses." desc = "Modified aviator glasses that can be switch between HUD and flash protection modes. Comes with bonus prescription lenses."
prescription = 6 prescription = 6

4
code/modules/mob/living/carbon/human/human.dm
View File

@@ -677,8 +677,8 @@
number -= 1 number -= 1
if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses)) if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
number += 1 number += 1
if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/toggle)) if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/aviator))
var/obj/item/clothing/glasses/sunglasses/sechud/toggle/S = src.glasses var/obj/item/clothing/glasses/sunglasses/sechud/aviator/S = src.glasses
if(!S.on) if(!S.on)
number += 1 number += 1
if(istype(src.glasses, /obj/item/clothing/glasses/welding)) if(istype(src.glasses, /obj/item/clothing/glasses/welding))