cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Togglable Science Goggles (#19203)

Browse Source 
Science goggles can now be toggled onto your forehead like safety
goggles.
This commit is contained in:
Sparky
2024-05-28 20:54:52 +00:00
committed by GitHub
parent 2eb05069ef
commit b790191c24
24 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/event/outfit_generic/science.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/clothing/glasses/regular,
/obj/item/clothing/glasses/regular,
/obj/item/clothing/glasses/safety/goggles,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
)
shoes = list(
/obj/item/clothing/shoes/workboots,
code/modules/client/preference_setup/loadout/items/eyes.dm
+1 -1
View File
@@ -71,7 +71,7 @@
goggles["goggles, safety"] = /obj/item/clothing/glasses/safety/goggles
goggles["goggles, safety (prescription)"] = /obj/item/clothing/glasses/safety/goggles/prescription
goggles["goggles, scanning"] = /obj/item/clothing/glasses/regular/scanners
goggles["goggles, science"] = /obj/item/clothing/glasses/science
goggles["goggles, science"] = /obj/item/clothing/glasses/safety/goggles/science
goggles["goggles, orange"] = /obj/item/clothing/glasses/spiffygogs
gear_tweaks += new /datum/gear_tweak/path(goggles)
code/modules/clothing/glasses/glasses.dm
+26 -21
View File
@@ -213,23 +213,6 @@ BLIND // can't see anything
icon_state = "panto_med"
item_state = "panto_med"
/obj/item/clothing/glasses/science
name = "science goggles"
desc = "Used to protect your eyes against harmful chemicals!"
icon_state = "purple"
item_state = "purple"
sprite_sheets = list(
BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/eyes.dmi'
)
toggleable = 1
unacidable = 1
item_flags = ITEM_FLAG_AIRTIGHT
anomaly_protection = 0.1
/obj/item/clothing/glasses/science/Initialize()
. = ..()
overlay = global_hud.science
/obj/item/clothing/glasses/night
name = "night vision goggles"
desc = "You can totally see in the dark now!"
@@ -266,8 +249,10 @@ BLIND // can't see anything
/obj/item/clothing/glasses/safety
name = "safety glasses"
desc = "A simple pair of safety glasses. Thinner than their goggle counterparts, for those who can't decide between safety and style."
icon = 'icons/obj/item/clothing/eyes/safety.dmi'
icon_state = "plaingoggles"
item_state = "plaingoggles"
contained_sprite = TRUE
item_flags = ITEM_FLAG_AIRTIGHT|ITEM_FLAG_THICK_MATERIAL
unacidable = 1
@@ -343,6 +328,30 @@ BLIND // can't see anything
desc = "A simple pair of safety goggles. It's general chemistry all over again. Comes with a prescription overlay."
prescription = 7
/obj/item/clothing/glasses/safety/goggles/science
name = "science goggles"
desc = "Used to protect your eyes against harmful chemicals!"
icon_state = "purple"
item_state = "purple"
sprite_sheets = list(
BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/eyes.dmi'
)
toggleable = 1
unacidable = 1
item_flags = ITEM_FLAG_AIRTIGHT
anomaly_protection = 0.1
/obj/item/clothing/glasses/safety/goggles/science/Initialize()
. = ..()
overlay = global_hud.science
/obj/item/clothing/glasses/safety/goggles/science/handle_additional_changes()
. = ..()
if(up)
overlay = null
else
overlay = global_hud.science
/obj/item/clothing/glasses/safety/goggles/wasteland
name = "wasteland goggles"
desc = "A pair of old goggles common in the Wasteland. A few denizens unfortunate enough to not \
@@ -351,7 +360,6 @@ BLIND // can't see anything
icon_state = "wasteland_goggles"
item_state = "wasteland_goggles"
off_state = "wasteland_goggles"
contained_sprite = TRUE
change_item_state_on_flip = TRUE
flip_down = "up to protect your eyes."
flip_up = "and let it hang around your neck."
@@ -364,7 +372,6 @@ BLIND // can't see anything
icon = 'icons/clothing/eyes/goon_goggles.dmi'
var/sprite_state = "military_goggles"
flash_protection = FLASH_PROTECTION_MODERATE //This needs to be set even if the state changes later, otherwise it spawns with no flash protection while appearing to be down
contained_sprite = TRUE
change_item_state_on_flip = TRUE
/obj/item/clothing/glasses/safety/goggles/tactical/Initialize(mapload, material_key)
@@ -389,7 +396,6 @@ BLIND // can't see anything
icon = 'icons/clothing/eyes/goon_goggles.dmi'
var/sprite_state = "security_goggles"
flash_protection = FLASH_PROTECTION_MODERATE
contained_sprite = TRUE
change_item_state_on_flip = TRUE
/obj/item/clothing/glasses/safety/goggles/goon/Initialize(mapload, material_key)
@@ -429,7 +435,6 @@ BLIND // can't see anything
var/brand_name
icon = 'icons/clothing/eyes/goon_goggles.dmi'
var/sprite_state = "security_goggles"
contained_sprite = TRUE
change_item_state_on_flip = TRUE
/obj/item/clothing/glasses/safety/goggles/medical/Initialize(mapload, material_key)
code/modules/item_worth/worths_list.dm
+1 -1
View File
@@ -413,7 +413,7 @@ var/list/worths = list(
//GLASSES,
/obj/item/clothing/glasses/meson/prescription = 880,
/obj/item/clothing/glasses/meson = 800,
/obj/item/clothing/glasses/science = 400,
/obj/item/clothing/glasses/safety/goggles/science = 400,
/obj/item/clothing/glasses/night = 1000,
/obj/item/clothing/glasses/regular/hipster = 400, //Hipstering is an expensive lifestyle yo,
/obj/item/clothing/glasses/regular = 300,
code/modules/research/xenoarchaeology/misc.dm
+1 -1
View File
@@ -68,7 +68,7 @@
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/sneakers/medsci(src)
new /obj/item/clothing/glasses/science(src)
new /obj/item/clothing/glasses/safety/goggles/science(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/storage/belt/archaeology(src)
new /obj/item/storage/box/excavation(src)