diff --git a/code/datums/outfits/event/outfit_generic/science.dm b/code/datums/outfits/event/outfit_generic/science.dm index 84933f5343a..f87cf6f4fcc 100644 --- a/code/datums/outfits/event/outfit_generic/science.dm +++ b/code/datums/outfits/event/outfit_generic/science.dm @@ -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, diff --git a/code/modules/client/preference_setup/loadout/items/eyes.dm b/code/modules/client/preference_setup/loadout/items/eyes.dm index 837999d4790..bb1131b384d 100644 --- a/code/modules/client/preference_setup/loadout/items/eyes.dm +++ b/code/modules/client/preference_setup/loadout/items/eyes.dm @@ -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) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2f590a9e4e8..ecb95c7b0c7 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -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) diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index de9fefb179c..2cf038587d1 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -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, diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 81bad34b3f3..3ce7a0d802e 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -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) diff --git a/html/changelogs/sci-goggles-toggle.yml b/html/changelogs/sci-goggles-toggle.yml new file mode 100644 index 00000000000..af56bfcb4be --- /dev/null +++ b/html/changelogs/sci-goggles-toggle.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - rscadd: "Science goggles can now be toggled onto your forehead." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index bf474e8a00a..40565f47a14 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/items/clothing/lefthand_glasses.dmi b/icons/mob/items/clothing/lefthand_glasses.dmi index 41b47eb13e1..610a09ef19c 100644 Binary files a/icons/mob/items/clothing/lefthand_glasses.dmi and b/icons/mob/items/clothing/lefthand_glasses.dmi differ diff --git a/icons/mob/items/clothing/righthand_glasses.dmi b/icons/mob/items/clothing/righthand_glasses.dmi index 3b4c3482500..b8b398c95e5 100644 Binary files a/icons/mob/items/clothing/righthand_glasses.dmi and b/icons/mob/items/clothing/righthand_glasses.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 861a00be444..d25a7a971e8 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/item/clothing/eyes/safety.dmi b/icons/obj/item/clothing/eyes/safety.dmi new file mode 100644 index 00000000000..d0d4f787137 Binary files /dev/null and b/icons/obj/item/clothing/eyes/safety.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 2880713775b..71d6cec1036 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -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 diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 1dfdbe3ae7c..43f1c7903f6 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -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 }, diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm index bca3ff66042..bcb6b5b56ef 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost.dmm @@ -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 }, diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm index d2b86d6deb7..a2233af78c2 100644 --- a/maps/away/away_site/cult_base/cult_base.dmm +++ b/maps/away/away_site/cult_base/cult_base.dmm @@ -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" }, diff --git a/maps/away/away_site/cult_base/cult_base_ghostroles.dm b/maps/away/away_site/cult_base/cult_base_ghostroles.dm index 1ccc0bb670f..4d2765203e4 100644 --- a/maps/away/away_site/cult_base/cult_base_ghostroles.dm +++ b/maps/away/away_site/cult_base/cult_base_ghostroles.dm @@ -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( diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm index c71d057cb29..ae3ffc2e14a 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm @@ -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" = ( diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index 59d80a8ca40..a644e835b02 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -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 diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 411cfc4647c..1fe2b1447a8 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -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{ diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 4e06ca71685..9cb330a4997 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -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) diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm index 274d6205fd2..488871cb0ab 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm @@ -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, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm index e401ca4c5b8..63af1115568 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm @@ -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 diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 486a76f560f..05b7709f1c2 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -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) diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 86f73bdb85a..10cd0ca8e68 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -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{