Skip to content

Repair Station Resprite + Directionals for WJ Storage. #12545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Detective-Google merged 3 commits into from
Jun 29, 2026
Merged

Repair Station Resprite + Directionals for WJ Storage. #12545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f6da6c
SynthsBeHappy
Ordosian Jun 28, 2026
7677260
ActuallyFixesWJ
Ordosian Jun 28, 2026
d6b54ce
Fixup maps in TGM format
Ordosian Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/game/machinery/cryopod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
GLOB.data_core.general -= G
qdel(G)

icon_state = "body_scanner_open"
icon_state = initial(icon_state)
set_light(0)

if(occupant.key)
Expand Down Expand Up @@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
occupant.forceMove(get_turf(src))
occupant = null
stop_processing()
icon_state = "body_scanner_open"
icon_state = initial(icon_state)
set_light(0)
playsound(src, 'sound/machines/pod_open.ogg', 30)
SEND_SIGNAL(src, COMSIG_CRYOPOD_GO_OUT)
Expand Down Expand Up @@ -765,7 +765,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
var/mob/living/carbon/human/man = occupant
man.species.handle_cryo(man)

icon_state = "body_scanner_open"
icon_state = initial(icon_state)
set_light(0)


Expand Down
3 changes: 3 additions & 0 deletions code/game/machinery/rechargestation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
///stun time upon exiting, if at all
var/exit_stun = 2

/obj/structure/machinery/recharge_station/alt
icon = 'icons/obj/structures/machinery/synth_repair_station.dmi'


/obj/structure/machinery/recharge_station/Initialize(mapload, ...)
. = ..()
Expand Down
Binary file added icons/obj/structures/machinery/synth_repair_station.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/structures/machinery/working_joe_storage.dmi
View file
Open in desktop
Binary file not shown.
29 changes: 22 additions & 7 deletions maps/map_files/BigRed/BigRed.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/dark,
/area/bigredv2/outside/space_port)
"aaB" = (
Expand Down Expand Up @@ -1954,7 +1954,10 @@
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
"aho" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt{
dir = 8;
layer = 3.1
},
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
"ahp" = (
Expand Down Expand Up @@ -2120,6 +2123,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/mars,
/area/bigredv2/outside/nw)
"ahY" = (
/obj/structure/machinery/recharge_station/alt{
dir = 8
},
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
"aia" = (
/obj/structure/machinery/door_control{
id = "Marshal Offices";
Expand Down Expand Up @@ -15637,7 +15646,9 @@
/turf/open/floor/darkblue2/west,
/area/bigredv2/caves/eta/storage)
"bxw" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt{
dir = 8
},
/turf/open/floor/dark,
/area/bigredv2/caves/eta/storage)
"bxx" = (
Expand Down Expand Up @@ -20676,7 +20687,9 @@
/area/bigredv2/caves/mining)
"eWB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt{
dir = 1
},
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/dorms)
"eWE" = (
Expand Down Expand Up @@ -25220,7 +25233,7 @@
/turf/open/mars_cave/mars_cave_2,
/area/bigredv2/caves/mining)
"jYF" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/almayer/test_floor4,
/area/bigredv2/outside/engineering)
"jYL" = (
Expand Down Expand Up @@ -32681,7 +32694,9 @@
/obj/structure/machinery/light{
dir = 8
},
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt{
dir = 1
},
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/dorms)
"rKP" = (
Expand Down Expand Up @@ -65567,7 +65582,7 @@ bpX
awp
bkT
blG
aho
ahY
aho
bkT
bkU
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/BigRed/standalone/landingzone_solaris_upp_lz1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
/turf/open/asphalt/cement_sunbleached/cement_sunbleached1,
/area/event/metal/dynamic/lit)
"bQ" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/almayer/tcomms,
/area/event/metal/dynamic/lit)
"bX" = (
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/BigRed/standalone/landingzone_solaris_uscm_lz1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/dark,
/area/bigredv2/outside/space_port)
"cF" = (
Expand Down
16 changes: 9 additions & 7 deletions maps/map_files/DesertDam/Desert_Dam.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35723,7 +35723,9 @@
/obj/structure/machinery/light{
dir = 4
},
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt{
dir = 8
},
/turf/open/floor/prison/darkbrown2/east,
/area/desert_dam/interior/dam_interior/auxilary_tool_storage)
"gav" = (
Expand Down Expand Up @@ -48535,7 +48537,7 @@
/turf/open/desert/dirt,
/area/desert_dam/interior/caves/central_caves)
"lbi" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/prison/darkyellow2/north,
/area/desert_dam/interior/lab_northeast/east_lab_workshop)
"lbo" = (
Expand Down Expand Up @@ -48843,7 +48845,7 @@
/turf/open/asphalt/cement/cement2,
/area/desert_dam/interior/dam_interior/east_tunnel_entrance)
"lhQ" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/darkyellow2/northeast,
/area/desert_dam/building/substation/northwest)
"lhU" = (
Expand Down Expand Up @@ -50541,7 +50543,7 @@
/turf/open/floor/prison/whitegreen/west,
/area/desert_dam/building/medical/lobby)
"lPp" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/prison,
/area/desert_dam/building/substation/west)
"lPB" = (
Expand Down Expand Up @@ -62079,7 +62081,7 @@
/turf/open/floor/prison/sterile_white/west,
/area/desert_dam/building/hydroponics/hydroponics_breakroom)
"qof" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/prison/darkyellow2/north,
/area/desert_dam/interior/dam_interior/engine_west_wing)
"qol" = (
Expand Down Expand Up @@ -73062,10 +73064,10 @@
/turf/open/asphalt,
/area/desert_dam/exterior/valley/valley_labs)
"uxi" = (
/obj/structure/machinery/recharge_station,
/obj/structure/sign/poster/safety{
pixel_y = 32
},
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/prison/southwest,
/area/desert_dam/interior/dam_interior/hangar_storage)
"uxu" = (
Expand Down Expand Up @@ -73676,7 +73678,7 @@
/turf/open/asphalt/cement_sunbleached/cement_sunbleached17,
/area/desert_dam/exterior/valley/valley_medical)
"uJZ" = (
/obj/structure/machinery/recharge_station,
/obj/structure/machinery/recharge_station/alt,
/turf/open/floor/prison/darkpurple2/northwest,
/area/desert_dam/interior/lab_northeast/east_lab_excavation)
"uKb" = (
Expand Down
Loading