From 412bd44575c802a75f3ca1578d717c8d2510ecd1 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Sun, 10 Jul 2022 18:49:30 -0500 Subject: [PATCH 1/3] adds fullupgrade borg charger also adds it to nukie and infil ship and bases, and Rebee. Replaces normal variant where any existed. --- _maps/map_files/generic/CentCom.dmm | 70 ++++++++++++---------- _maps/map_files/generic/City_of_Cogs.dmm | 6 +- _maps/shuttles/infiltrator_basic.dmm | 12 ++-- _maps/shuttles/infiltrator_cutter.dmm | 76 +++++++++++++----------- code/game/machinery/rechargestation.dm | 14 +++++ 5 files changed, 102 insertions(+), 76 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c8932f142729..7b98cce12b2c 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -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, @@ -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 @@ -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" @@ -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" @@ -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" @@ -42493,7 +42497,7 @@ aSh aVw afo aSA -aWF +dgz aPX aLw aBm @@ -43521,7 +43525,7 @@ adu aUR abs aSA -aUj +nfW ayS aLw aLD @@ -45646,7 +45650,7 @@ aVf apZ awp aku -axG +ria axG axG azx diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index 66593e1904fc..51d7f9fa7b55 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -279,6 +279,10 @@ "Ct" = ( /turf/closed/indestructible/riveted, /area/reebe) +"Us" = ( +/obj/machinery/recharge_station/fullupgrade, +/turf/open/floor/clockwork/reebe, +/area/reebe/city_of_cogs) "Vl" = ( /obj/structure/table/reinforced/brass, /obj/effect/landmark/servant_of_ratvar/scarab, @@ -4602,7 +4606,7 @@ ai am aj aj -aj +Us as ah ah diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 9cc6d472d378..929a913604e7 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -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 @@ -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 @@ -1730,7 +1730,7 @@ bO bW cg bP -cs +sI cy cE "} @@ -1780,7 +1780,7 @@ bQ bX ci cn -cs +sI cy cG "} diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index 071f81b7600a..6829807b6db2 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -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, @@ -866,26 +853,6 @@ }, /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 - }, -/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" - }, -/turf/open/floor/plating, -/area/shuttle/yogs/stealthcruiser) "rY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ @@ -1030,10 +997,34 @@ }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) +"No" = ( +/obj/machinery/recharge_station/fullupgrade, +/obj/machinery/power/apc{ + dir = 8; + name = "Syndicate Cutter APC"; + pixel_x = -25; + req_access = 150 + }, +/turf/open/floor/plating, +/area/shuttle/yogs/stealthcruiser) "Pz" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) +"QS" = ( +/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" + }, +/turf/open/floor/plating, +/area/shuttle/yogs/stealthcruiser) "Re" = ( /obj/machinery/button/door{ id = "syndicatecutter_bridge"; @@ -1047,6 +1038,19 @@ }, /turf/open/floor/plasteel/dark, /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) "Ys" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ @@ -1118,7 +1122,7 @@ ad am az aL -ad +No Dr Ey cP @@ -1133,7 +1137,7 @@ ag an aA aM -pF +QS Ys aA bH @@ -1207,7 +1211,7 @@ ad ad as aD -aQ +Vb ad bp aD diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 8b96798e7ac4..7657a81d05e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -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() From e8ab36250f19ee5fd42245b38bac8400905d3e71 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Sun, 10 Jul 2022 19:11:31 -0500 Subject: [PATCH 2/3] fixes the APC wiring on the infil cutter noticed right after I opened the PR --- _maps/shuttles/infiltrator_cutter.dmm | 85 +++++++++++++-------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/_maps/shuttles/infiltrator_cutter.dmm b/_maps/shuttles/infiltrator_cutter.dmm index 6829807b6db2..e6508b1cc270 100644 --- a/_maps/shuttles/infiltrator_cutter.dmm +++ b/_maps/shuttles/infiltrator_cutter.dmm @@ -853,6 +853,16 @@ }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) +"qo" = ( +/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, +/turf/open/floor/plating, +/area/shuttle/yogs/stealthcruiser) "rY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ @@ -916,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" = ( @@ -981,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 @@ -997,34 +1012,10 @@ }, /turf/open/floor/plating, /area/shuttle/yogs/stealthcruiser) -"No" = ( -/obj/machinery/recharge_station/fullupgrade, -/obj/machinery/power/apc{ - dir = 8; - name = "Syndicate Cutter APC"; - pixel_x = -25; - req_access = 150 - }, -/turf/open/floor/plating, -/area/shuttle/yogs/stealthcruiser) "Pz" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) -"QS" = ( -/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" - }, -/turf/open/floor/plating, -/area/shuttle/yogs/stealthcruiser) "Re" = ( /obj/machinery/button/door{ id = "syndicatecutter_bridge"; @@ -1038,6 +1029,17 @@ }, /turf/open/floor/plasteel/dark, /area/shuttle/yogs/stealthcruiser) +"SN" = ( +/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 + }, +/turf/open/floor/plating, +/area/shuttle/yogs/stealthcruiser) "Vb" = ( /obj/effect/turf_decal/delivery, /obj/machinery/airalarm{ @@ -1051,13 +1053,6 @@ }, /turf/open/floor/plasteel, /area/shuttle/yogs/stealthcruiser) -"Ys" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/shuttle/yogs/stealthcruiser) "YI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1122,8 +1117,8 @@ ad am az aL -No -Dr +JT +qo Ey cP ad @@ -1137,8 +1132,8 @@ ag an aA aM -QS -Ys +SN +Bd aA bH bQ From c523e8faa4c18d2ece96fc1ec2059e11f6828e2b Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Sun, 10 Jul 2022 19:15:42 -0500 Subject: [PATCH 3/3] nevermind on clockies they do not need this --- _maps/map_files/generic/City_of_Cogs.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index 51d7f9fa7b55..66593e1904fc 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -279,10 +279,6 @@ "Ct" = ( /turf/closed/indestructible/riveted, /area/reebe) -"Us" = ( -/obj/machinery/recharge_station/fullupgrade, -/turf/open/floor/clockwork/reebe, -/area/reebe/city_of_cogs) "Vl" = ( /obj/structure/table/reinforced/brass, /obj/effect/landmark/servant_of_ratvar/scarab, @@ -4606,7 +4602,7 @@ ai am aj aj -Us +aj as ah ah