Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
70 changes: 37 additions & 33 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23139,21 +23139,6 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"aUj" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm{
dir = 2;
pixel_y = 24
},
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/turf/open/floor/mineral/plastitanium,
/area/yogs/infiltrator_base)
"aUk" = (
/obj/structure/flora/tree/pine,
/turf/open/floor/holofloor/snow,
Expand Down Expand Up @@ -24313,21 +24298,6 @@
icon_state = "darkfull"
},
/area/holodeck/rec_center/gym)
"aWF" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
pixel_y = 24;
req_access = 150
},
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
/obj/item/flashlight,
/turf/open/floor/mineral/plastitanium,
/area/yogs/infiltrator_base)
"aWG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
Expand Down Expand Up @@ -26074,6 +26044,22 @@
"dbb" = (
/turf/open/indestructible/wiki/greenscreen,
/area/centcom/testchamber)
"dgz" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
pixel_y = 24;
req_access = 150
},
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
/obj/item/flashlight,
/obj/item/storage/firstaid/regular,
/turf/open/floor/mineral/plastitanium,
/area/yogs/infiltrator_base)
"dgH" = (
/turf/open/indestructible/wiki/info{
icon_state = "info25"
Expand Down Expand Up @@ -26247,6 +26233,20 @@
icon_state = "title2"
},
/area/centcom/testchamber)
"nfW" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm{
dir = 2;
pixel_y = 24
},
/obj/machinery/recharge_station/fullupgrade,
/turf/open/floor/mineral/plastitanium,
/area/yogs/infiltrator_base)
"nIM" = (
/turf/open/indestructible/wiki/title{
icon_state = "title8"
Expand Down Expand Up @@ -26284,6 +26284,10 @@
icon_state = "info11"
},
/area/centcom/testchamber)
"ria" = (
/obj/machinery/recharge_station/fullupgrade,
/turf/open/floor/plasteel/dark,
/area/syndicate_mothership/control)
"rib" = (
/turf/open/indestructible/wiki/info{
icon_state = "info7"
Expand Down Expand Up @@ -42493,7 +42497,7 @@ aSh
aVw
afo
aSA
aWF
dgz
aPX
aLw
aBm
Expand Down Expand Up @@ -43521,7 +43525,7 @@ adu
aUR
abs
aSA
aUj
nfW
ayS
aLw
aLD
Expand Down Expand Up @@ -45646,7 +45650,7 @@ aVf
apZ
awp
aku
axG
ria
axG
axG
azx
Expand Down
12 changes: 6 additions & 6 deletions _maps/shuttles/infiltrator_basic.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1166,10 +1166,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/shuttle/syndicate/hallway)
"cs" = (
/obj/machinery/recharge_station,
/turf/open/floor/circuit/red,
/area/shuttle/syndicate/armory)
"ct" = (
/obj/machinery/telecomms/allinone{
intercept = 1
Expand Down Expand Up @@ -1285,6 +1281,10 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"sI" = (
/obj/machinery/recharge_station/fullupgrade,
/turf/open/floor/circuit/red,
/area/shuttle/syndicate/armory)
"tZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
Expand Down Expand Up @@ -1730,7 +1730,7 @@ bO
bW
cg
bP
cs
sI
cy
cE
"}
Expand Down Expand Up @@ -1780,7 +1780,7 @@ bQ
bX
ci
cn
cs
sI
cy
cG
"}
Expand Down
93 changes: 46 additions & 47 deletions _maps/shuttles/infiltrator_cutter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -336,19 +336,6 @@
},
/turf/open/floor/plasteel,
/area/shuttle/yogs/stealthcruiser)
"aQ" = (
/obj/machinery/sleeper{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -24;
req_access = null;
req_access_txt = "150"
},
/turf/open/floor/plasteel,
/area/shuttle/yogs/stealthcruiser)
"aR" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate/freezer/blood,
Expand Down Expand Up @@ -866,24 +853,14 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/yogs/stealthcruiser)
"pF" = (
/obj/machinery/power/apc{
dir = 8;
name = "Syndicate Cutter APC";
pixel_x = -25;
req_access = 150
"qo" = (
/obj/machinery/power/smes/fullycharged,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24;
req_access = 150
},
/obj/structure/cable{
icon_state = "0-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/yogs/stealthcruiser)
"rY" = (
Expand Down Expand Up @@ -949,16 +926,8 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/yogs/stealthcruiser)
"Dr" = (
/obj/machinery/power/smes/fullycharged,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "0-4"
},
"Bd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/shuttle/yogs/stealthcruiser)
"Ey" = (
Expand Down Expand Up @@ -1014,6 +983,19 @@
/obj/machinery/computer/crew/syndie,
/turf/open/floor/plasteel/dark,
/area/shuttle/yogs/stealthcruiser)
"JT" = (
/obj/machinery/recharge_station/fullupgrade,
/obj/machinery/power/apc{
dir = 8;
name = "Syndicate Cutter APC";
pixel_x = -25;
req_access = 150
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/shuttle/yogs/stealthcruiser)
"Lb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
Expand Down Expand Up @@ -1047,13 +1029,30 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/yogs/stealthcruiser)
"Ys" = (
"SN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-8"
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24;
req_access = 150
},
/turf/open/floor/plating,
/area/shuttle/yogs/stealthcruiser)
"Vb" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -24;
req_access = null;
req_access_txt = "150"
},
/obj/machinery/sleeper/syndie/fullupgrade{
dir = 1
},
/turf/open/floor/plasteel,
/area/shuttle/yogs/stealthcruiser)
"YI" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
Expand Down Expand Up @@ -1118,8 +1117,8 @@ ad
am
az
aL
ad
Dr
JT
qo
Ey
cP
ad
Expand All @@ -1133,8 +1132,8 @@ ag
an
aA
aM
pF
Ys
SN
Bd
aA
bH
bQ
Expand Down Expand Up @@ -1207,7 +1206,7 @@ ad
ad
as
aD
aQ
Vb
ad
bp
aD
Expand Down
14 changes: 14 additions & 0 deletions code/game/machinery/rechargestation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,17 @@
if(!occupant)
return
SEND_SIGNAL(occupant, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, recharge_speed, repairs)

/obj/machinery/recharge_station/fullupgrade
flags_1 = NODECONSTRUCT_1

/obj/machinery/recharge_station/fullupgrade/Initialize()
. = ..()
update_icon()
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/cyborgrecharger(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stock_parts/cell/bluespace(null)
RefreshParts()