Skip to content

Commit

Permalink
Merge branch 'glasses_CE'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Riverz1
Riverz1 committed Feb 10, 2025
2 parents 24e62c9 + 5e018a0 commit ba44ddb
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 38 deletions.
6 changes: 6 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,12 @@
icon_state = "rwelding-g"
item_state = "rwelding-g"

/obj/item/clothing/glasses/welding/superior/cheif_eng
name = "superior welding goggles"
desc = "Welding goggles made from more expensive materials, strangely smells like oil."
icon_state = "rwelding_CE-g"
item_state = "rwelding_CE-g"

/obj/item/clothing/glasses/sunglasses/blindfold
name = "blindfold"
desc = "Covers the eyes, preventing sight."
Expand Down
Binary file modified icons/mob/eyes.dmi
View file
Binary file not shown.
Binary file modified icons/obj/clothing/glasses.dmi
View file
Binary file not shown.
9 changes: 5 additions & 4 deletions maps/boxstation/boxstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15707,6 +15707,7 @@
/obj/structure/rack,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_eng,
/obj/item/clothing/mask/breath,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/machinery/alarm{
Expand Down Expand Up @@ -19199,8 +19200,8 @@
"aHM" = (
/obj/structure/table/woodentable,
/obj/item/globe/adhomai{
pixel_y = 8;
pixel_x = -6
pixel_x = -6;
pixel_y = 8
},
/turf/simulated/floor/wood,
/area/station/security/vacantoffice)
Expand Down Expand Up @@ -24940,8 +24941,8 @@
/obj/structure/table/woodentable,
/obj/random/misc/book,
/obj/item/bust{
pixel_y = 4;
pixel_x = -8
pixel_x = -8;
pixel_y = 4
},
/turf/simulated/floor/wood,
/area/station/civilian/library)
Expand Down
1 change: 1 addition & 0 deletions maps/delta/delta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63131,6 +63131,7 @@
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_en,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/structure/sign/warning/electricshock{
pixel_y = -32
Expand Down
1 change: 1 addition & 0 deletions maps/falcon/falcon.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20735,6 +20735,7 @@
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/mask/breath,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_eng,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/machinery/camera{
c_tag = "Engineering CE Office";
Expand Down
1 change: 1 addition & 0 deletions maps/gamma/gamma.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12584,6 +12584,7 @@
network = list("SS13","Engineering")
},
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_eng,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
Expand Down
1 change: 1 addition & 0 deletions maps/prometheus/prometheus.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57472,6 +57472,7 @@
network = list("SS13","Engineering")
},
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_eng,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
Expand Down
69 changes: 35 additions & 34 deletions maps/stroechka/stroechka.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,8 @@
/area/station/engineering/engine)
"bn" = (
/obj/machinery/door/airlock/external{
name = "Escape Airlock";
dir = 4
dir = 4;
name = "Escape Airlock"
},
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -1242,9 +1242,9 @@
dir = 4
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -1677,9 +1677,9 @@
dir = 8
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
name = "Engineering largecell apc down";
pixel_y = -27;
custom_smartlight_preset = "Engineering"
pixel_y = -27
},
/turf/simulated/floor/plating,
/area/station/maintenance/auxsolarport)
Expand Down Expand Up @@ -1871,9 +1871,9 @@
icon_state = "bot"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Cargo";
dir = 4;
name = "Cargo largecell apc right";
custom_smartlight_preset = "Cargo";
pixel_x = 27
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -2320,8 +2320,8 @@
/area/station/hallway/secondary/exit)
"ee" = (
/obj/machinery/door/airlock/glass{
name = "Escape Hall";
dir = 4
dir = 4;
name = "Escape Hall"
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -2938,11 +2938,11 @@
},
/obj/machinery/door/airlock/mining{
autoclose = 0;
dir = 4;
frequency = 1379;
id_tag = "recucler_airlock_interior";
locked = 1;
name = "Recucler Internal Airlock";
dir = 4
name = "Recucler Internal Airlock"
},
/obj/machinery/access_button{
command = "cycle_interior";
Expand Down Expand Up @@ -3662,9 +3662,9 @@
/area/space)
"hK" = (
/obj/machinery/door/airlock/research/glass{
dir = 4;
name = "Mech Bay";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -3838,10 +3838,10 @@
icon_state = "delivery"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "RnD";
dir = 1;
name = "RnD largecell apc top";
pixel_y = 27;
custom_smartlight_preset = "RnD"
pixel_y = 27
},
/turf/simulated/floor,
/area/station/rnd/chargebay)
Expand Down Expand Up @@ -4433,10 +4433,10 @@
icon_state = "damaged_4"
},
/obj/machinery/power/apc{
name = "Engineering left APC";
custom_smartlight_preset = "Engineering";
pixel_x = -27;
dir = 8
dir = 8;
name = "Engineering left APC";
pixel_x = -27
},
/turf/simulated/floor/plating,
/area/station/maintenance/incinerator)
Expand Down Expand Up @@ -4529,9 +4529,9 @@
pixel_y = 5
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -5312,10 +5312,10 @@
/area/station/hallway/secondary/arrival)
"vT" = (
/obj/machinery/door/airlock/external{
dir = 4;
dock_tag = "arrival_escape";
locked = 1;
name = "Escape Airlock";
dir = 4
name = "Escape Airlock"
},
/obj/effect/decal/turf_decal/alpha/yellow{
icon_state = "delivery"
Expand Down Expand Up @@ -5584,9 +5584,9 @@
/area/station/engineering/equip)
"yW" = (
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engineering EVA";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -6103,6 +6103,7 @@
"Cw" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/rig/engineering/chief,
/obj/item/clothing/glasses/welding/superior/cheif_eng,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/head/helmet/space/rig/engineering/chief,
/obj/item/clothing/mask/breath,
Expand Down Expand Up @@ -6310,9 +6311,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -6372,8 +6373,8 @@
/area/station/hallway/secondary/arrival)
"DJ" = (
/obj/machinery/door/airlock/glass{
name = "Escape Hall";
dir = 4
dir = 4;
name = "Escape Hall"
},
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -6517,9 +6518,9 @@
icon_state = "warn"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 8;
name = "Engineering largecell apc left";
custom_smartlight_preset = "Engineering";
pixel_x = -27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -6664,9 +6665,9 @@
dir = 4
},
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engine Room";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/effect/decal/turf_decal/alpha/yellow{
icon_state = "delivery"
Expand Down Expand Up @@ -6932,9 +6933,9 @@
/area/station/hallway/primary/central)
"GM" = (
/obj/machinery/door/airlock/research/glass{
dir = 4;
name = "Research and Development";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -8466,9 +8467,9 @@
icon_state = "bot"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "Engineering";
dir = 4;
name = "Engineering largecell apc right";
custom_smartlight_preset = "Engineering";
pixel_x = 27
},
/turf/simulated/floor{
Expand All @@ -8491,9 +8492,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/largecell{
custom_smartlight_preset = "RnD";
dir = 4;
name = "RnD largecell apc right";
custom_smartlight_preset = "RnD";
pixel_x = 27
},
/turf/simulated/floor{
Expand Down Expand Up @@ -8943,9 +8944,9 @@
/area/shuttle/supply/station)
"Wn" = (
/obj/machinery/door/airlock/engineering/glass{
dir = 4;
name = "Engineering";
req_access = list(71);
dir = 4
req_access = list(71)
},
/obj/structure/cable{
d1 = 4;
Expand Down

0 comments on commit ba44ddb

Please sign in to comment.