cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +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 21:54:52 +01: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)
html/changelogs/sci-goggles-toggle.yml
+6
View File
@@ -0,0 +1,6 @@
author: Sparky_hotdog
delete-after: True
changes:
- rscadd: "Science goggles can now be toggled onto your forehead."
icons/mob/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

icons/mob/items/clothing/lefthand_glasses.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

icons/mob/items/clothing/righthand_glasses.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

icons/obj/clothing/glasses.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

icons/obj/item/clothing/eyes/safety.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

maps/aurora/aurora-3_sublevel.dmm
+4 -4
View File
@@ -2108,7 +2108,7 @@
/area/rnd/isolation_c)
"aff" = (
/obj/structure/table/rack,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/gloves/latex/nitrile,
/obj/item/clothing/suit/hazmat/anomaly,
@@ -5150,7 +5150,7 @@
req_access = list(7)
},
/obj/structure/table/rack,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/mask/gas/half{
pixel_x = -6;
pixel_y = -4
@@ -5202,7 +5202,7 @@
req_access = list(7)
},
/obj/structure/table/rack,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/mask/gas/half{
pixel_x = -6;
pixel_y = -4
@@ -10203,7 +10203,7 @@
req_access = list(7)
},
/obj/structure/table/rack,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/mask/gas/half{
pixel_x = -6;
pixel_y = -4
maps/aurora/aurora-4_mainlevel.dmm
+1 -1
View File
@@ -44750,7 +44750,7 @@
dir = 8
},
/obj/structure/table/standard,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/structure/sign/nosmoking_2{
pixel_x = -32
},
maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm
+3 -3
View File
@@ -421,7 +421,7 @@
/obj/machinery/light/broken{
dir = 8
},
/obj/item/clothing/glasses/science{
/obj/item/clothing/glasses/safety/goggles/science{
pixel_x = 3;
pixel_y = 8
},
@@ -3049,7 +3049,7 @@
"GX" = (
/obj/effect/floor_decal/industrial/warning,
/obj/structure/table/steel,
/obj/item/clothing/glasses/science{
/obj/item/clothing/glasses/safety/goggles/science{
pixel_x = 3;
pixel_y = 8
},
@@ -4446,7 +4446,7 @@
/area/crystal_planet_outpost/power)
"TT" = (
/obj/structure/table/standard,
/obj/item/clothing/glasses/science{
/obj/item/clothing/glasses/safety/goggles/science{
pixel_x = 3;
pixel_y = 8
},
maps/away/away_site/cult_base/cult_base.dmm
+1 -1
View File
@@ -5719,7 +5719,7 @@
req_access = null
},
/obj/random/loot,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/structure/cable{
icon_state = "0-2"
},
maps/away/away_site/cult_base/cult_base_ghostroles.dm
+1 -1
View File
@@ -115,7 +115,7 @@
/obj/item/clothing/glasses/sunglasses/aviator,
/obj/item/clothing/glasses/hud/health/aviator,
/obj/item/clothing/glasses/regular,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/glasses/safety/goggles,
)
gloves = list(
maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm
+2 -2
View File
@@ -2167,7 +2167,7 @@
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/storage/box/gloves,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/turf/simulated/floor/tiled/white,
/area/coc_survey_ship/research)
"sL" = (
@@ -3884,7 +3884,7 @@
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/storage/box/gloves,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/turf/simulated/floor/tiled/white,
/area/coc_survey_ship/research)
"Ga" = (
maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm
+4 -4
View File
@@ -941,13 +941,13 @@
pixel_y = 3
},
/obj/item/clothing/head/helmet/space/anomaly,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/suit/space/anomaly{
pixel_x = 1;
pixel_y = 3
},
/obj/item/clothing/head/helmet/space/anomaly,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/effect/floor_decal/industrial/outline/research,
/turf/simulated/floor/carpet/rubber,
/area/shuttle/dominian_science_shuttle)
@@ -6283,8 +6283,8 @@
/obj/item/clothing/gloves/latex,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/structure/table/rack{
dir = 8;
layer = 2.9
maps/away/ships/pra/database_freighter/database_freighter.dmm
+3 -3
View File
@@ -2152,7 +2152,7 @@
/obj/structure/table/rack,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/machinery/door/window/southleft{
@@ -3558,7 +3558,7 @@
/obj/structure/table/rack,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/machinery/door/window/southleft{
@@ -3690,7 +3690,7 @@
/obj/structure/table/rack,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/machinery/door/window/southleft{
maps/away/ships/scc/scc_scout_ship.dmm
+2 -2
View File
@@ -2091,13 +2091,13 @@
pixel_y = 3
},
/obj/item/clothing/head/helmet/space/anomaly,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/suit/space/anomaly{
pixel_x = 1;
pixel_y = 3
},
/obj/item/clothing/head/helmet/space/anomaly,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/machinery/light,
/turf/simulated/floor/carpet/rubber,
/area/shuttle/scc_scout_ship_shuttle/cargo)
maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm
+2 -2
View File
@@ -928,7 +928,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/suit/space/anomaly,
/obj/item/clothing/head/helmet/space/anomaly,
/obj/random/dirt_75,
@@ -1822,7 +1822,7 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/suit/space/anomaly,
/obj/item/clothing/head/helmet/space/anomaly,
/obj/random/dirt_75,
maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm
+1 -1
View File
@@ -244,7 +244,7 @@
/area/ouerea_skrell)
"xp" = (
/obj/structure/table/skrell,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/storage/box/monkeycubes/stokcubes,
/obj/effect/floor_decal/corner/purple{
dir = 5
maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+5 -5
View File
@@ -4512,7 +4512,7 @@
/obj/structure/table/rack,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/storage/box/gloves,
@@ -24132,7 +24132,7 @@
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/storage/box/gloves,
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_storage)
@@ -28314,13 +28314,13 @@
/obj/structure/table/rack,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/storage/box/gloves,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/tank/oxygen,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/suit/hazmat/anomaly,
/obj/item/storage/box/gloves,
@@ -28799,7 +28799,7 @@
/obj/item/tank/oxygen,
/obj/item/clothing/head/hazmat/anomaly,
/obj/item/clothing/mask/gas/alt,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/storage/box/gloves,
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_storage)
maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+4 -4
View File
@@ -6921,8 +6921,8 @@
/obj/structure/closet/secure_closet/scientist,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/item/clothing/glasses/safety/goggles/science,
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/white,
@@ -10577,7 +10577,7 @@
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/capacitor,
/obj/item/stack/cable_coil,
/obj/item/clothing/glasses/science{
/obj/item/clothing/glasses/safety/goggles/science{
pixel_y = 10
},
/turf/simulated/floor/tiled/white,
@@ -21240,7 +21240,7 @@
"jES" = (
/obj/structure/table/standard,
/obj/item/device/firing_pin/test_range,
/obj/item/clothing/glasses/science{
/obj/item/clothing/glasses/safety/goggles/science{
pixel_y = 10
},
/obj/structure/reagent_dispensers/acid{