From 324272f87e1c7cefb03506d890c81136f8b0faf0 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 11 May 2024 16:41:52 -0400 Subject: [PATCH 01/18] ship shaker --- _maps/map_files/YogStation/YogStation.dmm | 255 +++++++++++----------- 1 file changed, 131 insertions(+), 124 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index adb32de8cbbe..56d004e88289 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -2706,8 +2706,13 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "atS" = ( -/turf/closed/wall, -/area/space/nearstation) +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen, +/obj/item/gun/energy/plasmacutter, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/engine, +/area/escapepodbay) "atU" = ( /obj/machinery/computer/cargo{ dir = 1 @@ -4384,12 +4389,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 }, +/obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/plasteel, /area/escapepodbay) "aGc" = ( @@ -16747,8 +16752,7 @@ /turf/open/floor/plating, /area/security/prison) "dgz" = ( -/obj/structure/sign/warning/docking, -/obj/structure/grille, +/obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating/airless, /area/escapepodbay) "dgH" = ( @@ -22422,6 +22426,10 @@ "fgc" = ( /turf/closed/wall, /area/crew_quarters/kitchen) +"fgf" = ( +/obj/effect/spawner/structure/window/reinforced/shutter, +/turf/open/floor/engine/airless, +/area/escapepodbay) "fgq" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -23470,9 +23478,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/rack, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/rods/twentyfive, /turf/open/floor/plasteel, /area/escapepodbay) "fxX" = ( @@ -25894,6 +25899,11 @@ }, /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/secondarydatacore) +"gti" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/space, +/area/space) "gtj" = ( /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 @@ -33099,7 +33109,6 @@ /turf/open/floor/plasteel/stairs/goon/wood_stairs_middle, /area/library) "iOa" = ( -/obj/structure/spacepoddoor, /turf/open/floor/engine/airless, /area/escapepodbay) "iOb" = ( @@ -39850,6 +39859,7 @@ /area/medical/virology) "lsn" = ( /obj/machinery/light, +/obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/engine, /area/escapepodbay) "lsK" = ( @@ -46932,13 +46942,8 @@ /turf/open/floor/plasteel, /area/security/checkpoint/service) "nYC" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/structure/table, -/obj/item/stock_parts/cell/high/plus, -/obj/machinery/cell_charger, -/turf/open/floor/plasteel, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/engine, /area/escapepodbay) "nZd" = ( /obj/structure/table/wood/fancy, @@ -47884,11 +47889,10 @@ /turf/open/floor/carpet, /area/library) "osI" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/item/crowbar/red, -/turf/open/floor/plasteel, -/area/escapepodbay) +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "osP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -51790,13 +51794,9 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "pMy" = ( -/obj/machinery/button/door{ - id = "escapepodbay"; - name = "Pod Door Control"; - pixel_x = 6; - pixel_y = 24 - }, -/turf/open/floor/engine, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating/airless, /area/escapepodbay) "pNc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -57102,10 +57102,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "rIf" = ( -/obj/structure/spacepoddoor, -/obj/machinery/door/poddoor/multi_tile/four_tile_ver{ - id = "escapepodbay" - }, +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/oxygen, +/obj/item/gun/energy/plasmacutter, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/engine/airless, /area/escapepodbay) "rIo" = ( @@ -64569,8 +64570,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/engine/airless, -/area/space) +/area/escapepodbay) "uxA" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating{ @@ -72202,8 +72204,9 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/storage) "xnF" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating, /area/escapepodbay) "xnM" = ( /obj/machinery/light, @@ -73374,8 +73377,8 @@ /turf/open/floor/wood, /area/bridge/meeting_room) "xJr" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced/shutter, +/turf/open/floor/plating, /area/escapepodbay) "xJx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -74162,7 +74165,7 @@ /obj/structure/window{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel, /area/escapepodbay) "yaO" = ( @@ -74718,6 +74721,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"yjI" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space) "ykh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -123711,7 +123718,7 @@ aaS aaa aaa aaa -aaa +aae aaa aaa aaa @@ -124748,14 +124755,14 @@ aaa aaf aaa aaa -atS -aaf +aaa aoV aoV -atS -aaf -aaf -aaf +aoV +aaa +aaa +aaa +aoV qQV qQV qQV @@ -125005,14 +125012,14 @@ aaa aaa aaa aaa -atS -aoV -aoV -aoV -atS +aaa +aaa +aaa +aaa +aaa +aaa aoV aoV -aaf qQV qQV qQV @@ -125255,26 +125262,26 @@ aaa aaa aaa aaa +osI +aJt +aJt +aJt +aJt +osI +aJt +aJt +yjI +yjI +yjI +aJt +aJt +osI aaa aaa -aaa -aaa -aaa -aaa -aaa -atS -aoV -aoV -aoV -aaH aoV -aoV -aaf -atS -aaf aaa -ptH xJr +iEt hHb bQx tro @@ -125512,6 +125519,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -125519,19 +125527,18 @@ aaa aaa aaa aaa -atS aoV aoV aoV -aaH -aoV +aaa aoV +gti aoV -atS -aaf aaa -ptH -osI +aaa +aaa +xJr +iEt hld nDj yaD @@ -125769,6 +125776,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -125776,19 +125784,18 @@ aaa aaa aaa aaa -aaH -aoV aoV aoV -atS aoV +aaa aoV +yjI aoV -atS -aaf aaa -ptH -nYC +aaa +aaa +xJr +iEt iEt udt mUs @@ -126026,6 +126033,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -126033,16 +126041,15 @@ aaa aaa aaa aaa -atS aoV aoV aoV -atS +aaa aoV +yjI aoV aoV -aaf -aaf +aaa aaa ptH fxr @@ -126283,23 +126290,23 @@ aaa aaa aaa aaa +aJt +aaa aaa aaa aaa aaa aaa -aae aaa -atS aoV aoV aoV -atS -aoV +aaa aoV +yjI aoV aoV -aaf +aaa aaa ptH xBH @@ -126540,6 +126547,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -126547,22 +126555,21 @@ aaa aaa aaa aaa -aaf -aoV -aoV -aoV -atS aoV aoV aoV +aaa +aaa +aJt +aaa aoV -aaf +aaa aaa ptH aNZ sHo sHo -sHo +nYC aMZ odE aPq @@ -126797,6 +126804,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -126804,22 +126812,21 @@ aaa aaa aaa aaa -aaf aoV aoV aoV -aaf aoV aoV +yjI aoV aoV -aaf aaa -ptH +aaa pMy sHo sHo sHo +atS aMZ odE thb @@ -127054,29 +127061,29 @@ aaa aaa aaa aaa +aJt aaa aaa aaa aaa aaa aaa -aaa -aoV aoV aoV aoV -aaf aoV +aaa aoV +yjI aoV aoV aaa aaa -ptH -sHo +pMy sHo sHo sHo +atS ptH mrq xZK @@ -127311,6 +127318,7 @@ aaa aaa aaa aaa +aJt aaa aaa aaa @@ -127323,18 +127331,17 @@ aaa aaa aaa aaa -aaa -aaa +aJt aaa aaa aaa aaa xnF -iOa +sHo iOa iOa rIf -xnF +dgz aRW aRW qOl @@ -127568,20 +127575,20 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osI +aJt +aJt +aJt +aJt +aJt +aJt +aJt +aJt +osI +aJt +aJt +aJt +osI aaa aaa aaa @@ -127591,7 +127598,7 @@ uxv uxv uxv uxv -dgz +fgf aaf aRW jOV From 12b87f904d5e2e1e68b193ec8cf901e74de6d62e Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sat, 11 May 2024 20:12:01 -0400 Subject: [PATCH 02/18] a lot --- _maps/map_files/YogStation/YogStation.dmm | 310 +++++++++--------- _maps/templates/shipbreaker/old_nt.dmm | 26 ++ code/modules/shipbreaker/shipbreak_console.dm | 52 +++ yogstation.dme | 2 + .../code/game/area/Space_Station_13_areas.dm | 5 + .../code/game/objects/effects/landmarks.dm | 6 + .../code/modules/shipbreaker/shipbreaker.dm | 16 + 7 files changed, 262 insertions(+), 155 deletions(-) create mode 100644 _maps/templates/shipbreaker/old_nt.dmm create mode 100644 code/modules/shipbreaker/shipbreak_console.dm create mode 100644 yogstation/code/modules/shipbreaker/shipbreaker.dm diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 56d004e88289..2cd5c4a212dd 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -25899,11 +25899,6 @@ }, /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/secondarydatacore) -"gti" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space) "gtj" = ( /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 @@ -29001,6 +28996,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"hwn" = ( +/obj/machinery/computer/shipbreaker, +/turf/open/floor/plasteel, +/area/escapepodbay) "hwq" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Plasma Tank Pump" @@ -47888,11 +47887,6 @@ }, /turf/open/floor/carpet, /area/library) -"osI" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "osP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -52691,6 +52685,9 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"qcN" = ( +/turf/open/space/basic, +/area/shipbreak) "qdd" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, @@ -56116,6 +56113,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"rpx" = ( +/obj/effect/landmark/shipbreak, +/turf/open/space, +/area/shipbreak) "rpB" = ( /turf/open/floor/carpet, /area/crew_quarters/bar) @@ -71933,6 +71934,9 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/bar) +"xiq" = ( +/turf/open/space, +/area/shipbreak) "xit" = ( /obj/machinery/power/apc{ areastring = "/area/security/warden"; @@ -74721,10 +74725,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"yjI" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space) "ykh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -125262,20 +125262,20 @@ aaa aaa aaa aaa -osI -aJt -aJt -aJt -aJt -osI -aJt -aJt -yjI -yjI -yjI -aJt -aJt -osI +tgE +gXs +gXs +gXs +gXs +tgE +gXs +gXs +aaf +aaf +aaf +gXs +gXs +tgE aaa aaa aoV @@ -125519,26 +125519,26 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aaa -aoV -gti +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +qcN +rpx +rav aoV aaa aaa aaa xJr -iEt +hwn hld nDj yaD @@ -125776,20 +125776,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aaa -aoV -yjI +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +qcN +xiq +aaf aoV aaa aaa @@ -126033,20 +126033,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aaa -aoV -yjI +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +qcN +xiq +aaf aoV aoV aaa @@ -126290,20 +126290,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aaa -aoV -yjI +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +qcN +xiq +aaf aoV aoV aaa @@ -126547,20 +126547,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aaa -aaa -aJt +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +qcN +qcN +gXs aaa aoV aaa @@ -126804,20 +126804,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aoV -aoV -yjI +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +xiq +xiq +aaf aoV aoV aaa @@ -127061,20 +127061,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aoV -aaa -aoV -yjI +gXs +qcN +qcN +qcN +qcN +qcN +qcN +xiq +xiq +xiq +xiq +qcN +xiq +aaf aoV aoV aaa @@ -127318,20 +127318,20 @@ aaa aaa aaa aaa -aJt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aJt +gXs +qcN +qcN +qcN +qcN +qcN +qcN +qcN +qcN +qcN +qcN +qcN +qcN +gXs aaa aaa aaa @@ -127575,20 +127575,20 @@ aaa aaa aaa aaa -osI -aJt -aJt -aJt -aJt -aJt -aJt -aJt -aJt -osI -aJt -aJt -aJt -osI +tgE +gXs +gXs +gXs +gXs +gXs +gXs +gXs +gXs +tgE +gXs +gXs +gXs +tgE aaa aaa aaa diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm new file mode 100644 index 000000000000..12cb24082496 --- /dev/null +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -0,0 +1,26 @@ +"a" = (/turf/open/floor/plating,/area/template_noop) +"d" = (/turf/open/floor/mineral/titanium,/area/template_noop) +"p" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/template_noop) +"r" = (/obj/machinery/door/airlock/external/glass,/turf/open/floor/plating,/area/template_noop) +"u" = (/turf/open/floor/mineral/titanium/airless/broken/five,/area/template_noop) +"w" = (/turf/closed/wall/mineral/titanium,/area/template_noop) +"C" = (/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/template_noop) +"F" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating,/area/template_noop) +"K" = (/obj/structure/window,/turf/open/floor/mineral/titanium/blue/airless,/area/template_noop) +"Q" = (/obj/structure/window,/turf/open/floor/plating,/area/template_noop) +"Y" = (/turf/open/floor/mineral/titanium/blue/airless,/area/template_noop) + +(1,1,1) = {" +wwCCCCww +wdddaaaw +wddddaaw +wddddaaw +waaaaaaw +waaYauaw +raaYYYar +wauaYYaw +waYYYaaw +wKKKKKQw +wFFFFFFw +wppppppw +"} diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm new file mode 100644 index 000000000000..487aa65fcfec --- /dev/null +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -0,0 +1,52 @@ +/obj/machinery/computer/shipbreaker + name = "Shipbreaking Shuttle Console" + desc = "A computer console used to call a ship for breaking, how original!" + icon_screen = "holocontrol" + + + var/turf/bottom_left + +///what area type this holodeck loads into. linked turns into the nearest instance of this area + var/area/mapped_start_area = /area/shipbreak + +///the currently used map template + var/datum/map_template/shipbreaker/template + +///List of ships to spawn. + var/list/possible_ships = list() + +///subtypes of this (but not this itself) are loadable programs + var/ship_type = /datum/map_template/shipbreaker + +///links the shipbreaker zone to the computer + var/area/shipbreak/linked +///cool variablw + var/spawn_area_clear = TRUE + +/obj/machinery/computer/shipbreaker/Initialize(mapload) + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/computer/shipbreaker/LateInitialize() + linked = GLOB.areas_by_type[mapped_start_area] + bottom_left = locate(linked.x, linked.y, src.z) + for(var/ship in subtypesof(ship_type)) + var/datum/map_template/shipbreaker/s = new ship + possible_ships+= s + +/obj/machinery/computer/shipbreaker/proc/spawn_ship() + area_clear_check() + if(!spawn_area_clear) + say("ERROR: SHIPBREAKING ZONE NOT CLEAR, PLEASE REMOVE ALL REMAINING SHIP PARTS") + return + var/datum/map_template/shipbreaker/ship_to_spawn = pick(possible_ships) + + ship_to_spawn.load(bottom_left) + +/obj/machinery/computer/shipbreaker/proc/area_clear_check() + for(var/turf/t in linked) + if(!isspaceturf(t)) + spawn_area_clear = FALSE + return + + spawn_area_clear = TRUE diff --git a/yogstation.dme b/yogstation.dme index 89702ec3a4ad..d0d06bf2388e 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -3697,6 +3697,7 @@ #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\level_interface.dm" #include "code\modules\security_levels\security_level_datums.dm" +#include "code\modules\shipbreaker\shipbreak_console.dm" #include "code\modules\shuttle\ai_ship.dm" #include "code\modules\shuttle\arrivals.dm" #include "code\modules\shuttle\assault_pod.dm" @@ -4504,6 +4505,7 @@ #include "yogstation\code\modules\scripting\Parser\Parser.dm" #include "yogstation\code\modules\scripting\Scanner\Scanner.dm" #include "yogstation\code\modules\scripting\Scanner\token.dm" +#include "yogstation\code\modules\shipbreaker\shipbreaker.dm" #include "yogstation\code\modules\shuttle\emergency.dm" #include "yogstation\code\modules\shuttle\syndicate.dm" #include "yogstation\code\modules\spacepods\construction.dm" diff --git a/yogstation/code/game/area/Space_Station_13_areas.dm b/yogstation/code/game/area/Space_Station_13_areas.dm index 824f11bb9e49..3afc5c14a02b 100644 --- a/yogstation/code/game/area/Space_Station_13_areas.dm +++ b/yogstation/code/game/area/Space_Station_13_areas.dm @@ -73,3 +73,8 @@ /area/security/podbay name = "Security Podbay" icon_state = "security" + + +/area/shipbreak + name = "Shipbreak Zone" + icon_state = "escape" diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 69d1e7c5e183..20938b5938f0 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -246,4 +246,10 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) GLOB.infiltrator_objective_items += loc return INITIALIZE_HINT_QDEL + +/obj/effect/landmark/shipbreak + name = "shipbreak spawnpoint" + icon_state = "Tourist" + + #undef EMPTY_SPAWN diff --git a/yogstation/code/modules/shipbreaker/shipbreaker.dm b/yogstation/code/modules/shipbreaker/shipbreaker.dm new file mode 100644 index 000000000000..b83ad212bfb3 --- /dev/null +++ b/yogstation/code/modules/shipbreaker/shipbreaker.dm @@ -0,0 +1,16 @@ +/datum/map_template/shipbreaker + should_place_on_top = FALSE + returns_created_atoms = TRUE + keep_cached_map = TRUE + + var/template_id + var/description + var/datum/parsed_map/lastparsed + + + +/datum/map_template/shipbreaker/nt_old + name = "Old NT Ship" + template_id = "old_nt" + description = "mapshaker" + mappath = "_maps/templates/shipbreaker/old_nt.dmm" From b444bdd0078522711447731e058c34577f767ad6 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sun, 12 May 2024 16:14:49 -0400 Subject: [PATCH 03/18] yay --- code/modules/shipbreaker/shipbreak_console.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index 487aa65fcfec..d5b51d26bbe4 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -50,3 +50,8 @@ return spawn_area_clear = TRUE + +/obj/machinery/computer/shipbreaker/proc/clear_floor_plating() + for(var/turf/t in linked) + if(isfloorturf(t)) + t.ScrapeAway() From 7e61d830bdfc44d7df263df7a878e14a49049713 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Sun, 12 May 2024 16:34:41 -0400 Subject: [PATCH 04/18] ship shaker --- code/modules/shipbreaker/shipbreak_console.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index d5b51d26bbe4..05640a054189 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -55,3 +55,5 @@ for(var/turf/t in linked) if(isfloorturf(t)) t.ScrapeAway() + + From 0a1448693eafd92b2bb585205eb5a9e39d3f3493 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 15:11:02 -0400 Subject: [PATCH 05/18] haha its done --- _maps/templates/shipbreaker/old_nt.dmm | 26 --- _maps/templates/shipbreaker/old_syndicate.dmm | 191 ++++++++++++++++++ code/modules/shipbreaker/shipbreak_console.dm | 20 ++ .../tgui/interfaces/ShipbreakerConsole.tsx | 28 +++ .../code/modules/shipbreaker/shipbreaker.dm | 9 +- 5 files changed, 243 insertions(+), 31 deletions(-) delete mode 100644 _maps/templates/shipbreaker/old_nt.dmm create mode 100644 _maps/templates/shipbreaker/old_syndicate.dmm create mode 100644 tgui/packages/tgui/interfaces/ShipbreakerConsole.tsx diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm deleted file mode 100644 index 12cb24082496..000000000000 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ /dev/null @@ -1,26 +0,0 @@ -"a" = (/turf/open/floor/plating,/area/template_noop) -"d" = (/turf/open/floor/mineral/titanium,/area/template_noop) -"p" = (/obj/structure/shuttle/engine/propulsion,/turf/open/floor/plating,/area/template_noop) -"r" = (/obj/machinery/door/airlock/external/glass,/turf/open/floor/plating,/area/template_noop) -"u" = (/turf/open/floor/mineral/titanium/airless/broken/five,/area/template_noop) -"w" = (/turf/closed/wall/mineral/titanium,/area/template_noop) -"C" = (/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/template_noop) -"F" = (/obj/structure/shuttle/engine/heater,/turf/open/floor/plating,/area/template_noop) -"K" = (/obj/structure/window,/turf/open/floor/mineral/titanium/blue/airless,/area/template_noop) -"Q" = (/obj/structure/window,/turf/open/floor/plating,/area/template_noop) -"Y" = (/turf/open/floor/mineral/titanium/blue/airless,/area/template_noop) - -(1,1,1) = {" -wwCCCCww -wdddaaaw -wddddaaw -wddddaaw -waaaaaaw -waaYauaw -raaYYYar -wauaYYaw -waYYYaaw -wKKKKKQw -wFFFFFFw -wppppppw -"} diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm new file mode 100644 index 000000000000..b70d0831b915 --- /dev/null +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -0,0 +1,191 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"b" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner/north, +/turf/open/floor/plating, +/area/template_noop) +"h" = ( +/obj/effect/spawner/structure/window/plastitanium, +/turf/open/floor/plating, +/area/template_noop) +"m" = ( +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating, +/area/template_noop) +"o" = ( +/obj/machinery/computer/shuttle/syndicate, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"t" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating, +/area/template_noop) +"u" = ( +/obj/item/pda/syndicate, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"x" = ( +/obj/machinery/computer/shuttle/syndicate, +/turf/open/floor/mineral/plastitanium/broken, +/area/template_noop) +"E" = ( +/turf/closed/wall/mineral/plastitanium, +/area/template_noop) +"F" = ( +/obj/item/bodybag/environmental/prisoner/syndicate, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"H" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"L" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"M" = ( +/turf/open/floor/mineral/plastitanium/broken, +/area/template_noop) +"P" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"Q" = ( +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/turf/open/floor/mineral/plastitanium/broken/five, +/area/template_noop) +"V" = ( +/obj/item/bodybag/environmental/prisoner/syndicate, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) + +(1,1,1) = {" +E +E +E +E +E +m +E +E +E +E +E +E +"} +(2,1,1) = {" +h +a +a +a +U +L +L +L +L +L +b +t +"} +(3,1,1) = {" +h +a +a +a +a +L +L +V +L +L +b +t +"} +(4,1,1) = {" +h +x +H +a +a +L +L +L +L +L +b +t +"} +(5,1,1) = {" +h +o +P +L +a +L +L +a +a +L +b +t +"} +(6,1,1) = {" +h +x +P +L +M +L +a +a +F +a +b +t +"} +(7,1,1) = {" +h +L +L +V +L +L +a +Q +Q +a +b +t +"} +(8,1,1) = {" +h +L +L +Q +L +L +a +Q +Q +u +b +t +"} +(9,1,1) = {" +E +E +E +E +E +m +E +E +E +E +E +E +"} diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index 05640a054189..18995689fff1 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -57,3 +57,23 @@ t.ScrapeAway() +/obj/machinery/computer/shipbreaker/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ShipbreakerConsole", name) + ui.open() + + +/obj/machinery/computer/shipbreaker/ui_act(action, params) + . = ..() + if(.) + return + . = TRUE + + switch(action) + if("spawn_ship") + spawn_ship() + return + if("clear_floor_plating") + clear_floor_plating() + return diff --git a/tgui/packages/tgui/interfaces/ShipbreakerConsole.tsx b/tgui/packages/tgui/interfaces/ShipbreakerConsole.tsx new file mode 100644 index 000000000000..26366b5fa62d --- /dev/null +++ b/tgui/packages/tgui/interfaces/ShipbreakerConsole.tsx @@ -0,0 +1,28 @@ +import { useBackend } from '../backend'; +import { Button, LabeledList, Section } from '../components'; +import { Window } from '../layouts'; + +export const ShipbreakerConsole = (props, context) => { + const { act, data } = useBackend(context); + // Extract `health` and `color` variables from the `data` object. + // const { + // health, + // color, + // } = data; + return ( + + +
+
+
+
+ + + ); +}; diff --git a/yogstation/code/modules/shipbreaker/shipbreaker.dm b/yogstation/code/modules/shipbreaker/shipbreaker.dm index b83ad212bfb3..02d8fef828fa 100644 --- a/yogstation/code/modules/shipbreaker/shipbreaker.dm +++ b/yogstation/code/modules/shipbreaker/shipbreaker.dm @@ -8,9 +8,8 @@ var/datum/parsed_map/lastparsed - -/datum/map_template/shipbreaker/nt_old - name = "Old NT Ship" - template_id = "old_nt" +/datum/map_template/shipbreaker/syndicate_old + name = "Old Syndicate Ship" + template_id = "old_syndicate" description = "mapshaker" - mappath = "_maps/templates/shipbreaker/old_nt.dmm" + mappath = "_maps/templates/shipbreaker/old_syndicate.dmm" From fcaaa4ed087017440df4e6fc6f94c2fafee057f6 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 17:14:21 -0400 Subject: [PATCH 06/18] update ships --- _maps/templates/shipbreaker/old_nt.dmm | 202 ++++++++++++++++ _maps/templates/shipbreaker/old_robotics.dmm | 218 ++++++++++++++++++ _maps/templates/shipbreaker/old_syndicate.dmm | 65 +++--- .../code/modules/shipbreaker/shipbreaker.dm | 15 +- 4 files changed, 462 insertions(+), 38 deletions(-) create mode 100644 _maps/templates/shipbreaker/old_nt.dmm create mode 100644 _maps/templates/shipbreaker/old_robotics.dmm diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm new file mode 100644 index 000000000000..afcbc3946ad6 --- /dev/null +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -0,0 +1,202 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/mineral/titanium/interior, +/area/template_noop) +"f" = ( +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/template_noop) +"h" = ( +/obj/item/banner/medical, +/turf/open/floor/plating, +/area/template_noop) +"j" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner/north, +/turf/open/floor/plating, +/area/template_noop) +"m" = ( +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/plating, +/area/template_noop) +"o" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating, +/area/template_noop) +"r" = ( +/obj/structure/table/reinforced, +/obj/item/pen/fountain/captain, +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/plating, +/area/template_noop) +"s" = ( +/turf/open/floor/plating, +/area/template_noop) +"t" = ( +/turf/closed/wall/mineral/titanium, +/area/template_noop) +"x" = ( +/turf/open/floor/mineral/titanium/airless, +/area/template_noop) +"y" = ( +/obj/machinery/computer/shuttle, +/turf/open/floor/plating, +/area/template_noop) +"z" = ( +/obj/structure/statue/gold/cmo, +/turf/open/floor/mineral/titanium/airless, +/area/template_noop) +"B" = ( +/obj/machinery/suit_storage_unit/cmo, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"C" = ( +/obj/machinery/sleeper, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"D" = ( +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"F" = ( +/obj/machinery/door/airlock/titanium, +/turf/open/floor/plating, +/area/template_noop) +"G" = ( +/turf/open/space/basic, +/area/template_noop) +"M" = ( +/turf/open/floor/mineral/titanium/white, +/area/template_noop) +"Q" = ( +/obj/structure/statue/gold/cmo, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"S" = ( +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/mineral/titanium/white, +/area/template_noop) +"T" = ( +/mob/living/simple_animal/bot/medbot, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"W" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/plating, +/area/template_noop) +"Y" = ( +/obj/structure/sign/departments/minsky/medical/medical2, +/turf/closed/wall/mineral/titanium/interior, +/area/template_noop) + +(1,1,1) = {" +G +t +t +F +t +t +t +F +t +t +t +G +"} +(2,1,1) = {" +t +z +x +s +m +s +M +M +S +M +j +o +"} +(3,1,1) = {" +t +x +x +s +s +M +s +M +s +s +j +o +"} +(4,1,1) = {" +f +y +W +x +s +s +h +M +s +h +j +o +"} +(5,1,1) = {" +f +r +W +s +s +D +a +Y +F +a +j +o +"} +(6,1,1) = {" +t +D +D +D +D +D +a +D +T +D +j +o +"} +(7,1,1) = {" +t +Q +D +D +D +D +a +B +C +C +j +o +"} +(8,1,1) = {" +G +t +t +t +t +t +t +t +t +t +t +G +"} diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm new file mode 100644 index 000000000000..eb4141e2674b --- /dev/null +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -0,0 +1,218 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/space/basic, +/area/template_noop) +"e" = ( +/turf/open/floor/engine/airless, +/area/template_noop) +"j" = ( +/turf/closed/wall/mineral/titanium, +/area/template_noop) +"k" = ( +/obj/machinery/door/poddoor/shutters/window, +/turf/open/floor/plating, +/area/template_noop) +"n" = ( +/obj/machinery/computer/rdconsole/robotics, +/turf/open/floor/engine/airless, +/area/template_noop) +"r" = ( +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/template_noop) +"t" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/engine/airless, +/area/template_noop) +"u" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner/north, +/turf/open/floor/plating, +/area/template_noop) +"y" = ( +/obj/structure/bed/surgical_mat, +/turf/open/floor/engine/airless, +/area/template_noop) +"F" = ( +/obj/machinery/mecha_part_fabricator, +/turf/open/floor/engine/airless, +/area/template_noop) +"H" = ( +/obj/item/circular_saw, +/turf/open/floor/engine/airless, +/area/template_noop) +"M" = ( +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating, +/area/template_noop) +"N" = ( +/obj/item/organ/cyberimp/chest/spinalspeed/toy, +/turf/open/floor/engine/airless, +/area/template_noop) +"O" = ( +/obj/machinery/shuttle/engine/void, +/turf/open/floor/plating, +/area/template_noop) +"Q" = ( +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/turf/open/floor/engine/airless, +/area/template_noop) +"S" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/obj/item/stack/sheet/mineral/silver, +/turf/open/floor/engine/airless, +/area/template_noop) +"U" = ( +/obj/structure/window/plastitanium, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, +/area/template_noop) +"Y" = ( +/obj/structure/chair, +/turf/open/floor/engine/airless, +/area/template_noop) +"Z" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/turf/open/floor/engine/airless, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +j +j +k +k +k +j +j +j +a +"} +(3,1,1) = {" +j +j +j +j +e +e +e +e +S +Z +j +a +"} +(4,1,1) = {" +r +n +t +e +e +e +e +e +e +e +u +O +"} +(5,1,1) = {" +U +n +t +e +H +e +e +e +F +e +u +O +"} +(6,1,1) = {" +j +j +j +j +y +N +e +e +Y +Q +j +a +"} +(7,1,1) = {" +a +a +a +j +j +j +M +j +j +j +j +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index b70d0831b915..1d93d5a6a677 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -7,6 +7,10 @@ /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating, /area/template_noop) +"c" = ( +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) "h" = ( /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, @@ -24,8 +28,7 @@ /turf/open/floor/plating, /area/template_noop) "u" = ( -/obj/item/pda/syndicate, -/turf/open/floor/mineral/plastitanium, +/turf/open/space/basic, /area/template_noop) "x" = ( /obj/machinery/computer/shuttle/syndicate, @@ -46,7 +49,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/template_noop) "M" = ( -/turf/open/floor/mineral/plastitanium/broken, +/obj/machinery/shieldwallgen, +/turf/open/floor/plating, /area/template_noop) "P" = ( /obj/structure/chair/comfy/shuttle, @@ -56,7 +60,8 @@ /turf/open/floor/plating, /area/template_noop) "U" = ( -/turf/open/floor/mineral/plastitanium/broken/five, +/obj/machinery/shieldwallgen, +/turf/open/floor/mineral/plastitanium/red, /area/template_noop) "V" = ( /obj/item/bodybag/environmental/prisoner/syndicate, @@ -75,30 +80,30 @@ E E E E -E +u "} (2,1,1) = {" -h +E a a a -U -L -L +E L +E +U L L b t "} (3,1,1) = {" -h -a +E a a a -L -L +E +c +E V L L @@ -135,12 +140,12 @@ t "} (6,1,1) = {" h -x -P L -M L -a +L +E +c +E a F a @@ -148,44 +153,30 @@ b t "} (7,1,1) = {" -h +E L L V +E L -L -a -Q +E +M Q a b t "} (8,1,1) = {" -h -L -L -Q -L -L -a -Q -Q -u -b -t -"} -(9,1,1) = {" E E E E E -m -E +c E E E E E +u "} diff --git a/yogstation/code/modules/shipbreaker/shipbreaker.dm b/yogstation/code/modules/shipbreaker/shipbreaker.dm index 02d8fef828fa..9020d3b6144d 100644 --- a/yogstation/code/modules/shipbreaker/shipbreaker.dm +++ b/yogstation/code/modules/shipbreaker/shipbreaker.dm @@ -11,5 +11,18 @@ /datum/map_template/shipbreaker/syndicate_old name = "Old Syndicate Ship" template_id = "old_syndicate" - description = "mapshaker" + description = "mapshaker_syndicate" mappath = "_maps/templates/shipbreaker/old_syndicate.dmm" + + +/datum/map_template/shipbreaker/nt_old + name = "Old NT Medical Ship" + template_id = "old_NT_Med" + description = "mapshaker_NT_Med" + mappath = "_maps/templates/shipbreaker/old_nt.dmm" + +/datum/map_template/shipbreaker/robotics_old + name = "Old Robotics Ship" + template_id = "old_Robo" + description = "mapshaker_old_robo" + mappath = "_maps/templates/shipbreaker/old_robotics.dmm" From d0416424824a8e27afb1297aaa85dbf1d0ceae54 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 17:23:52 -0400 Subject: [PATCH 07/18] pupdate --- _maps/map_files/YogStation/YogStation.dmm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 2cd5c4a212dd..fcf62efbc2de 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -2709,7 +2709,6 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/item/tank/internals/oxygen, -/obj/item/gun/energy/plasmacutter, /obj/item/storage/toolbox/mechanical, /turf/open/floor/engine, /area/escapepodbay) @@ -37882,7 +37881,9 @@ dir = 4; id = "garbage" }, -/obj/machinery/recycler, +/obj/machinery/recycler{ + can_be_unanchored = 1 + }, /obj/structure/sign/warning/securearea{ name = "\improper STAY CLEAR HEAVY MACHINERY"; pixel_y = 32 @@ -57106,7 +57107,6 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/item/tank/internals/oxygen, -/obj/item/gun/energy/plasmacutter, /obj/item/storage/toolbox/mechanical, /turf/open/floor/engine/airless, /area/escapepodbay) @@ -72954,6 +72954,7 @@ dir = 1; light_color = "#c1caff" }, +/obj/machinery/recycler, /turf/open/floor/engine, /area/escapepodbay) "xBK" = ( From 5e540b4a86e4fe54106b488533be2023e8e34a80 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 17:25:20 -0400 Subject: [PATCH 08/18] yee --- _maps/map_files/YogStation/YogStation.dmm | 6 +- _maps/templates/shipbreaker/old_nt.dmm | 292 +++++++++---------- _maps/templates/shipbreaker/old_robotics.dmm | 220 +++++++------- 3 files changed, 257 insertions(+), 261 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index fcf62efbc2de..4d029b3f2940 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -56114,10 +56114,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"rpx" = ( -/obj/effect/landmark/shipbreak, -/turf/open/space, -/area/shipbreak) "rpB" = ( /turf/open/floor/carpet, /area/crew_quarters/bar) @@ -125532,7 +125528,7 @@ xiq xiq xiq qcN -rpx +xiq rav aoV aaa diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm index afcbc3946ad6..5f015d93e1b4 100644 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -1,202 +1,202 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/closed/wall/mineral/titanium/interior, -/area/template_noop) -"f" = ( -/obj/structure/window/plastitanium, -/turf/open/floor/plating, +/turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) -"h" = ( +"c" = ( /obj/item/banner/medical, /turf/open/floor/plating, /area/template_noop) -"j" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plating, +"d" = ( +/turf/open/space/basic, /area/template_noop) -"m" = ( -/obj/item/clothing/accessory/armband/medblue, +"e" = ( +/obj/machinery/door/airlock/titanium, /turf/open/floor/plating, /area/template_noop) -"o" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/open/floor/plating, +"j" = ( +/obj/structure/statue/gold/cmo, +/turf/open/floor/mineral/titanium/airless, /area/template_noop) -"r" = ( -/obj/structure/table/reinforced, -/obj/item/pen/fountain/captain, -/obj/item/clothing/accessory/armband/medblue, -/turf/open/floor/plating, +"k" = ( +/turf/closed/wall/mineral/titanium, /area/template_noop) -"s" = ( +"l" = ( +/obj/structure/chair/comfy/shuttle, /turf/open/floor/plating, /area/template_noop) -"t" = ( -/turf/closed/wall/mineral/titanium, +"p" = ( +/turf/open/floor/mineral/titanium/white, +/area/template_noop) +"u" = ( +/obj/machinery/sleeper, +/turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) -"x" = ( +"A" = ( /turf/open/floor/mineral/titanium/airless, /area/template_noop) -"y" = ( +"D" = ( /obj/machinery/computer/shuttle, /turf/open/floor/plating, /area/template_noop) -"z" = ( -/obj/structure/statue/gold/cmo, -/turf/open/floor/mineral/titanium/airless, -/area/template_noop) -"B" = ( -/obj/machinery/suit_storage_unit/cmo, -/turf/open/floor/mineral/titanium/blue/airless, +"G" = ( +/obj/structure/window/plastitanium, +/turf/open/floor/plating, /area/template_noop) -"C" = ( -/obj/machinery/sleeper, -/turf/open/floor/mineral/titanium/blue/airless, +"I" = ( +/turf/closed/wall/mineral/titanium/interior, /area/template_noop) -"D" = ( -/turf/open/floor/mineral/titanium/blue/airless, +"J" = ( +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/plating, /area/template_noop) -"F" = ( -/obj/machinery/door/airlock/titanium, +"K" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating, /area/template_noop) -"G" = ( -/turf/open/space/basic, +"L" = ( +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/mineral/titanium/white, /area/template_noop) "M" = ( -/turf/open/floor/mineral/titanium/white, +/obj/structure/table/reinforced, +/obj/item/pen/fountain/captain, +/obj/item/clothing/accessory/armband/medblue, +/turf/open/floor/plating, /area/template_noop) -"Q" = ( -/obj/structure/statue/gold/cmo, +"N" = ( +/obj/structure/sign/departments/minsky/medical/medical2, +/turf/closed/wall/mineral/titanium/interior, +/area/template_noop) +"P" = ( +/obj/machinery/suit_storage_unit/cmo, /turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) -"S" = ( -/obj/item/clothing/accessory/armband/medblue, -/turf/open/floor/mineral/titanium/white, +"Q" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating, /area/template_noop) -"T" = ( -/mob/living/simple_animal/bot/medbot, -/turf/open/floor/mineral/titanium/blue/airless, +"S" = ( +/turf/open/floor/plating, /area/template_noop) "W" = ( -/obj/structure/chair/comfy/shuttle, -/turf/open/floor/plating, +/obj/structure/statue/gold/cmo, +/turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) "Y" = ( -/obj/structure/sign/departments/minsky/medical/medical2, -/turf/closed/wall/mineral/titanium/interior, +/mob/living/simple_animal/bot/medbot, +/turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) (1,1,1) = {" -G -t -t -F -t -t -t -F -t -t -t -G +d +k +k +e +k +k +k +e +k +k +k +d "} (2,1,1) = {" -t -z -x -s -m -s -M -M -S -M +k j -o +A +S +J +S +p +p +L +p +K +Q "} (3,1,1) = {" -t -x -x -s -s -M -s -M -s -s -j -o +k +A +A +S +S +p +S +p +S +S +K +Q "} (4,1,1) = {" -f -y -W -x -s -s -h -M -s -h -j -o +G +D +l +A +S +S +c +p +S +c +K +Q "} (5,1,1) = {" -f -r -W -s -s -D -a -Y -F +G +M +l +S +S a -j -o +I +N +e +I +K +Q "} (6,1,1) = {" -t -D -D -D -D -D +k a -D -T -D -j -o +a +a +a +a +I +a +Y +a +K +Q "} (7,1,1) = {" -t -Q -D -D -D -D +k +W a -B -C -C -j -o +a +a +a +I +P +u +u +K +Q "} (8,1,1) = {" -G -t -t -t -t -t -t -t -t -t -t -G +d +k +k +k +k +k +k +k +k +k +k +d "} diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm index eb4141e2674b..836a2d1e8c5e 100644 --- a/_maps/templates/shipbreaker/old_robotics.dmm +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -2,62 +2,76 @@ "a" = ( /turf/open/space/basic, /area/template_noop) -"e" = ( -/turf/open/floor/engine/airless, -/area/template_noop) -"j" = ( -/turf/closed/wall/mineral/titanium, +"c" = ( +/obj/structure/window/plastitanium, +/obj/structure/window/plastitanium, +/turf/open/floor/plating, /area/template_noop) -"k" = ( +"m" = ( /obj/machinery/door/poddoor/shutters/window, /turf/open/floor/plating, /area/template_noop) "n" = ( -/obj/machinery/computer/rdconsole/robotics, +/obj/machinery/shuttle/engine/void, +/turf/open/floor/plating, +/area/template_noop) +"o" = ( /turf/open/floor/engine/airless, /area/template_noop) "r" = ( /obj/structure/window/plastitanium, /turf/open/floor/plating, /area/template_noop) +"s" = ( +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/plating, +/area/template_noop) "t" = ( -/obj/structure/chair/comfy/shuttle, +/obj/item/organ/cyberimp/chest/spinalspeed/toy, /turf/open/floor/engine/airless, /area/template_noop) -"u" = ( -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plating, -/area/template_noop) -"y" = ( -/obj/structure/bed/surgical_mat, +"w" = ( +/obj/structure/chair, /turf/open/floor/engine/airless, /area/template_noop) -"F" = ( +"x" = ( +/turf/closed/wall/mineral/titanium, +/area/template_noop) +"D" = ( /obj/machinery/mecha_part_fabricator, /turf/open/floor/engine/airless, /area/template_noop) -"H" = ( -/obj/item/circular_saw, +"E" = ( +/obj/machinery/computer/rdconsole/robotics, /turf/open/floor/engine/airless, /area/template_noop) -"M" = ( -/obj/machinery/door/airlock/external/glass, -/turf/open/floor/plating, -/area/template_noop) -"N" = ( -/obj/item/organ/cyberimp/chest/spinalspeed/toy, +"G" = ( +/obj/structure/bed/surgical_mat, /turf/open/floor/engine/airless, /area/template_noop) -"O" = ( -/obj/machinery/shuttle/engine/void, -/turf/open/floor/plating, +"H" = ( +/obj/item/circular_saw, +/turf/open/floor/engine/airless, /area/template_noop) -"Q" = ( -/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +"I" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, /turf/open/floor/engine/airless, /area/template_noop) -"S" = ( +"K" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, @@ -76,31 +90,17 @@ /obj/item/stack/sheet/mineral/silver, /turf/open/floor/engine/airless, /area/template_noop) -"U" = ( -/obj/structure/window/plastitanium, -/obj/structure/window/plastitanium, +"L" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating, /area/template_noop) -"Y" = ( -/obj/structure/chair, +"X" = ( +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, /turf/open/floor/engine/airless, /area/template_noop) -"Z" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, -/obj/item/stack/sheet/mineral/gold, +"Y" = ( +/obj/structure/chair/comfy/shuttle, /turf/open/floor/engine/airless, /area/template_noop) @@ -122,84 +122,84 @@ a a a a -j -j -k -k -k -j -j -j +x +x +m +m +m +x +x +x a "} (3,1,1) = {" -j -j -j -j -e -e -e -e -S -Z -j +x +x +x +x +o +o +o +o +K +I +x a "} (4,1,1) = {" r +E +Y +o +o +o +o +o +o +o +L n -t -e -e -e -e -e -e -e -u -O "} (5,1,1) = {" -U -n -t -e +c +E +Y +o H -e -e -e -F -e -u -O +o +o +o +D +o +L +n "} (6,1,1) = {" -j -j -j -j -y -N -e -e -Y -Q -j +x +x +x +x +G +t +o +o +w +X +x a "} (7,1,1) = {" a a a -j -j -j -M -j -j -j -j +x +x +x +s +x +x +x +x a "} (8,1,1) = {" From 8444d6f927c3e542be13ff3cc97ea5c7aa0cf29e Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 18:02:06 -0400 Subject: [PATCH 09/18] update --- yogstation/code/game/objects/effects/landmarks.dm | 6 ------ yogstation/code/modules/shipbreaker/shipbreaker.dm | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 20938b5938f0..69d1e7c5e183 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -246,10 +246,4 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) GLOB.infiltrator_objective_items += loc return INITIALIZE_HINT_QDEL - -/obj/effect/landmark/shipbreak - name = "shipbreak spawnpoint" - icon_state = "Tourist" - - #undef EMPTY_SPAWN diff --git a/yogstation/code/modules/shipbreaker/shipbreaker.dm b/yogstation/code/modules/shipbreaker/shipbreaker.dm index 9020d3b6144d..71bbf64400e1 100644 --- a/yogstation/code/modules/shipbreaker/shipbreaker.dm +++ b/yogstation/code/modules/shipbreaker/shipbreaker.dm @@ -1,5 +1,5 @@ /datum/map_template/shipbreaker - should_place_on_top = FALSE + should_place_on_top = TRUE returns_created_atoms = TRUE keep_cached_map = TRUE From 98a3675712eb987acc89e1655b5870d065c267ca Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Mon, 13 May 2024 18:06:00 -0400 Subject: [PATCH 10/18] update --- _maps/templates/shipbreaker/old_nt.dmm | 6 +- _maps/templates/shipbreaker/old_robotics.dmm | 2 +- _maps/templates/shipbreaker/old_syndicate.dmm | 88 +++++++++---------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm index 5f015d93e1b4..ec8cd8049328 100644 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -7,7 +7,7 @@ /turf/open/floor/plating, /area/template_noop) "d" = ( -/turf/open/space/basic, +/turf/template_noop, /area/template_noop) "e" = ( /obj/machinery/door/airlock/titanium, @@ -25,7 +25,7 @@ /turf/open/floor/plating, /area/template_noop) "p" = ( -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/mineral/titanium/white/airless, /area/template_noop) "u" = ( /obj/machinery/sleeper, @@ -56,7 +56,7 @@ /area/template_noop) "L" = ( /obj/item/clothing/accessory/armband/medblue, -/turf/open/floor/mineral/titanium/white, +/turf/open/floor/mineral/titanium/white/airless, /area/template_noop) "M" = ( /obj/structure/table/reinforced, diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm index 836a2d1e8c5e..c781c0e15c60 100644 --- a/_maps/templates/shipbreaker/old_robotics.dmm +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space/basic, +/turf/template_noop, /area/template_noop) "c" = ( /obj/structure/window/plastitanium, diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index 1d93d5a6a677..d9298348d868 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "b" = ( /obj/structure/shuttle/engine/heater, @@ -9,16 +9,12 @@ /area/template_noop) "c" = ( /obj/machinery/door/airlock/external/glass, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "h" = ( /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/template_noop) -"m" = ( -/obj/machinery/door/airlock/external/glass, -/turf/open/floor/plating, -/area/template_noop) "o" = ( /obj/machinery/computer/shuttle/syndicate, /turf/open/floor/mineral/plastitanium, @@ -28,44 +24,44 @@ /turf/open/floor/plating, /area/template_noop) "u" = ( -/turf/open/space/basic, +/turf/template_noop, /area/template_noop) "x" = ( /obj/machinery/computer/shuttle/syndicate, -/turf/open/floor/mineral/plastitanium/broken, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "E" = ( /turf/closed/wall/mineral/plastitanium, /area/template_noop) "F" = ( /obj/item/bodybag/environmental/prisoner/syndicate, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "H" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "L" = ( /turf/open/floor/mineral/plastitanium/red, /area/template_noop) "M" = ( /obj/machinery/shieldwallgen, -/turf/open/floor/plating, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "P" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "Q" = ( -/turf/open/floor/plating, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "U" = ( /obj/machinery/shieldwallgen, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) "V" = ( /obj/item/bodybag/environmental/prisoner/syndicate, -/turf/open/floor/mineral/plastitanium/red, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) (1,1,1) = {" @@ -74,7 +70,7 @@ E E E E -m +c E E E @@ -84,29 +80,29 @@ u "} (2,1,1) = {" E -a -a -a +Q +Q +Q E -L +a E U -L -L +a +a b t "} (3,1,1) = {" E -a -a -a +Q +Q +Q E c E V -L -L +a +a b t "} @@ -114,13 +110,13 @@ t h x H +Q +Q a -a -L -L -L -L L +a +a +a b t "} @@ -128,41 +124,41 @@ t h o P -L -a -L -L a +Q a L +Q +Q +a b t "} (6,1,1) = {" -h -L -L -L +E +a +a +a E c E -a +Q F -a +Q b t "} (7,1,1) = {" E -L -L +a +a V E -L +a E M Q -a +Q b t "} From 272b53d1495434ebf07d500a03e48824a691f016 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 00:05:49 -0400 Subject: [PATCH 11/18] Updates ships. and shipbreaking zone --- _maps/map_files/YogStation/YogStation.dmm | 39 +++++++++++----- _maps/templates/shipbreaker/old_nt.dmm | 45 +++++++++++++++---- _maps/templates/shipbreaker/old_robotics.dmm | 34 ++++++++++---- _maps/templates/shipbreaker/old_syndicate.dmm | 34 +++++++++++--- 4 files changed, 117 insertions(+), 35 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 4d029b3f2940..1beabe404e65 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -2710,6 +2710,10 @@ /obj/item/clothing/mask/gas, /obj/item/tank/internals/oxygen, /obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, /turf/open/floor/engine, /area/escapepodbay) "atU" = ( @@ -36895,6 +36899,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"kkr" = ( +/obj/structure/marker_beacon, +/turf/open/floor/catwalk_floor, +/area/space/nearstation) "kkv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -55902,6 +55910,9 @@ }, /turf/open/floor/plating, /area/storage/tech) +"rkA" = ( +/turf/open/floor/catwalk_floor, +/area/space/nearstation) "rkM" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -57104,6 +57115,10 @@ /obj/item/clothing/mask/gas, /obj/item/tank/internals/oxygen, /obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, /turf/open/floor/engine/airless, /area/escapepodbay) "rIo" = ( @@ -126815,10 +126830,10 @@ xiq xiq xiq aaf -aoV -aoV -aaa -aaa +kkr +rkA +rkA +kkr pMy sHo sHo @@ -127072,10 +127087,10 @@ xiq qcN xiq aaf -aoV -aoV -aaa -aaa +uBx +rkA +rkA +uBx pMy sHo sHo @@ -127329,10 +127344,10 @@ qcN qcN qcN gXs -aaa -aaa -aaa -aaa +kkr +rkA +rkA +kkr xnF sHo iOa diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm index ec8cd8049328..a3fd6420dcda 100644 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -13,6 +13,14 @@ /obj/machinery/door/airlock/titanium, /turf/open/floor/plating, /area/template_noop) +"f" = ( +/obj/item/reagent_containers/pill/floorpill, +/turf/open/floor/mineral/titanium/airless, +/area/template_noop) +"h" = ( +/obj/item/stack/medical/suture/medicated, +/turf/open/floor/mineral/titanium/airless, +/area/template_noop) "j" = ( /obj/structure/statue/gold/cmo, /turf/open/floor/mineral/titanium/airless, @@ -31,6 +39,10 @@ /obj/machinery/sleeper, /turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) +"z" = ( +/obj/item/stack/medical/ointment/antiseptic, +/turf/open/floor/mineral/titanium/white/airless, +/area/template_noop) "A" = ( /turf/open/floor/mineral/titanium/airless, /area/template_noop) @@ -62,12 +74,17 @@ /obj/structure/table/reinforced, /obj/item/pen/fountain/captain, /obj/item/clothing/accessory/armband/medblue, +/obj/item/stack/medical/ointment, /turf/open/floor/plating, /area/template_noop) "N" = ( /obj/structure/sign/departments/minsky/medical/medical2, /turf/closed/wall/mineral/titanium/interior, /area/template_noop) +"O" = ( +/obj/item/stack/medical/gauze, +/turf/open/floor/mineral/titanium/white/airless, +/area/template_noop) "P" = ( /obj/machinery/suit_storage_unit/cmo, /turf/open/floor/mineral/titanium/blue/airless, @@ -79,6 +96,18 @@ "S" = ( /turf/open/floor/plating, /area/template_noop) +"T" = ( +/obj/item/stack/medical/gauze, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/obj/item/stack/medical/suture/medicated, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) +"V" = ( +/obj/item/reagent_containers/pill/floorpill, +/turf/open/floor/mineral/titanium/blue/airless, +/area/template_noop) "W" = ( /obj/structure/statue/gold/cmo, /turf/open/floor/mineral/titanium/blue/airless, @@ -105,26 +134,26 @@ d (2,1,1) = {" k j -A +h S J -S -p +T p +z L -p +O K Q "} (3,1,1) = {" k -A +f A S S p S -p +O S S K @@ -168,7 +197,7 @@ a I a Y -a +V K Q "} @@ -178,7 +207,7 @@ W a a a -a +U I P u diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm index c781c0e15c60..863e26411a6e 100644 --- a/_maps/templates/shipbreaker/old_robotics.dmm +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -7,6 +7,10 @@ /obj/structure/window/plastitanium, /turf/open/floor/plating, /area/template_noop) +"i" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/engine/airless, +/area/template_noop) "m" = ( /obj/machinery/door/poddoor/shutters/window, /turf/open/floor/plating, @@ -30,6 +34,10 @@ /obj/item/organ/cyberimp/chest/spinalspeed/toy, /turf/open/floor/engine/airless, /area/template_noop) +"v" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/engine/airless, +/area/template_noop) "w" = ( /obj/structure/chair, /turf/open/floor/engine/airless, @@ -45,6 +53,10 @@ /obj/machinery/computer/rdconsole/robotics, /turf/open/floor/engine/airless, /area/template_noop) +"F" = ( +/obj/structure/mecha_wreckage/durand, +/turf/open/floor/engine/airless, +/area/template_noop) "G" = ( /obj/structure/bed/surgical_mat, /turf/open/floor/engine/airless, @@ -69,6 +81,7 @@ /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/gold, +/obj/item/bodypart/r_leg/ipc/sgmipc, /turf/open/floor/engine/airless, /area/template_noop) "K" = ( @@ -88,6 +101,7 @@ /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/mineral/silver, +/obj/item/bodypart/head/ipc/zhpipc, /turf/open/floor/engine/airless, /area/template_noop) "L" = ( @@ -103,6 +117,10 @@ /obj/structure/chair/comfy/shuttle, /turf/open/floor/engine/airless, /area/template_noop) +"Z" = ( +/mob/living/simple_animal/hostile/hivebot, +/turf/open/floor/engine/airless, +/area/template_noop) (1,1,1) = {" a @@ -137,9 +155,9 @@ x x x x +Z o -o -o +v o K I @@ -150,12 +168,12 @@ a r E Y +i o o +v o -o -o -o +i o L n @@ -164,13 +182,13 @@ n c E Y -o +v H o o -o +v D -o +F L n "} diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index d9298348d868..258f1850011d 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -11,14 +11,22 @@ /obj/machinery/door/airlock/external/glass, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) +"g" = ( +/obj/structure/closet/syndicate, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) "h" = ( /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/template_noop) "o" = ( -/obj/machinery/computer/shuttle/syndicate, +/obj/machinery/modular_computer, /turf/open/floor/mineral/plastitanium, /area/template_noop) +"p" = ( +/obj/item/restraints/handcuffs/cable/zipties/used, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) "t" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating, @@ -26,8 +34,16 @@ "u" = ( /turf/template_noop, /area/template_noop) +"w" = ( +/obj/item/restraints/handcuffs/cable/zipties/used, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) "x" = ( -/obj/machinery/computer/shuttle/syndicate, +/obj/machinery/modular_computer, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) +"B" = ( +/obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "E" = ( @@ -41,6 +57,10 @@ /obj/structure/chair/comfy/shuttle, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) +"J" = ( +/obj/item/storage/box/zipties, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) "L" = ( /turf/open/floor/mineral/plastitanium/red, /area/template_noop) @@ -88,7 +108,7 @@ a E U a -a +J b t "} @@ -101,7 +121,7 @@ E c E V -a +w a b t @@ -128,7 +148,7 @@ a Q a L -Q +B Q a b @@ -144,13 +164,13 @@ c E Q F -Q +p b t "} (7,1,1) = {" E -a +g a V E From 24355d27a39c5bf03d845c8fe6a16ee760915c7d Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 00:18:36 -0400 Subject: [PATCH 12/18] Updates shipbreaking zone --- _maps/map_files/YogStation/YogStation.dmm | 130 ++++++++++++---------- 1 file changed, 71 insertions(+), 59 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1beabe404e65..cbbb07191b26 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -33124,6 +33124,10 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"iOc" = ( +/obj/machinery/recycler, +/turf/open/floor/catwalk_floor, +/area/escapepodbay) "iOB" = ( /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; @@ -46863,6 +46867,10 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"nXe" = ( +/obj/structure/lattice, +/turf/open/floor/catwalk_floor, +/area/space/nearstation) "nXj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -56410,6 +56418,11 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"ruv" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/floor/catwalk_floor, +/area/space/nearstation) "rvc" = ( /obj/machinery/light, /obj/item/radio/intercom{ @@ -72965,7 +72978,6 @@ dir = 1; light_color = "#c1caff" }, -/obj/machinery/recycler, /turf/open/floor/engine, /area/escapepodbay) "xBK" = ( @@ -125274,23 +125286,23 @@ aaa aaa aaa aaa -tgE -gXs -gXs -gXs -gXs -tgE -gXs -gXs -aaf -aaf -aaf -gXs -gXs -tgE -aaa +ruv +nXe +nXe +nXe +nXe +ruv +nXe +nXe +nXe +nXe +nXe +nXe +nXe +ruv +rkA +rkA aaa -aoV aaa xJr iEt @@ -125531,7 +125543,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -125544,10 +125556,10 @@ xiq xiq qcN xiq -rav -aoV -aaa +ruv aaa +rkA +rkA aaa xJr hwn @@ -125788,7 +125800,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -125801,10 +125813,10 @@ xiq xiq qcN xiq -aaf -aoV -aaa +nXe aaa +iOc +rkA aaa xJr iEt @@ -126045,7 +126057,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -126058,10 +126070,10 @@ xiq xiq qcN xiq -aaf -aoV +nXe aoV -aaa +rkA +rkA aaa ptH fxr @@ -126302,7 +126314,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -126315,10 +126327,10 @@ xiq xiq qcN xiq -aaf -aoV +nXe aoV -aaa +rkA +rkA aaa ptH xBH @@ -126559,7 +126571,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -126572,10 +126584,10 @@ xiq xiq qcN qcN -gXs -aaa -aoV +nXe aaa +rkA +rkA aaa ptH aNZ @@ -126816,7 +126828,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -126829,7 +126841,7 @@ xiq xiq xiq xiq -aaf +nXe kkr rkA rkA @@ -127073,7 +127085,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -127086,11 +127098,11 @@ xiq xiq qcN xiq -aaf -uBx +nXe +aaa rkA rkA -uBx +aaa pMy sHo sHo @@ -127330,7 +127342,7 @@ aaa aaa aaa aaa -gXs +nXe qcN qcN qcN @@ -127343,7 +127355,7 @@ qcN qcN qcN qcN -gXs +nXe kkr rkA rkA @@ -127587,20 +127599,20 @@ aaa aaa aaa aaa -tgE -gXs -gXs -gXs -gXs -gXs -gXs -gXs -gXs -tgE -gXs -gXs -gXs -tgE +ruv +nXe +nXe +nXe +nXe +nXe +nXe +nXe +nXe +ruv +nXe +nXe +nXe +ruv aaa aaa aaa From e512e98b9244700c228ba3ef5f2d7fa37602c4b2 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 16:26:22 -0400 Subject: [PATCH 13/18] Updates ships from Addust --- _maps/templates/shipbreaker/old_nt.dmm | 60 ++--- _maps/templates/shipbreaker/old_robotics.dmm | 75 +++--- _maps/templates/shipbreaker/old_syndicate.dmm | 232 +++++++++++++----- code/modules/shipbreaker/shipbreak_console.dm | 2 +- 4 files changed, 240 insertions(+), 129 deletions(-) diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm index a3fd6420dcda..1d9bce579a8a 100644 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -15,6 +15,7 @@ /area/template_noop) "f" = ( /obj/item/reagent_containers/pill/floorpill, +/obj/structure/statue/gold/cmo, /turf/open/floor/mineral/titanium/airless, /area/template_noop) "h" = ( @@ -22,21 +23,24 @@ /turf/open/floor/mineral/titanium/airless, /area/template_noop) "j" = ( -/obj/structure/statue/gold/cmo, -/turf/open/floor/mineral/titanium/airless, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/template_noop) "k" = ( /turf/closed/wall/mineral/titanium, /area/template_noop) "l" = ( -/obj/structure/chair/comfy/shuttle, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, /turf/open/floor/plating, /area/template_noop) "p" = ( /turf/open/floor/mineral/titanium/white/airless, /area/template_noop) "u" = ( -/obj/machinery/sleeper, +/obj/machinery/sleeper{ + dir = 8 + }, /turf/open/floor/mineral/titanium/blue/airless, /area/template_noop) "z" = ( @@ -51,7 +55,7 @@ /turf/open/floor/plating, /area/template_noop) "G" = ( -/obj/structure/window/plastitanium, +/obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/template_noop) "I" = ( @@ -79,7 +83,7 @@ /area/template_noop) "N" = ( /obj/structure/sign/departments/minsky/medical/medical2, -/turf/closed/wall/mineral/titanium/interior, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/template_noop) "O" = ( /obj/item/stack/medical/gauze, @@ -120,15 +124,15 @@ (1,1,1) = {" d k -k +j e -k -k -k +j +j +j e -k -k -k +j +j +j d "} (2,1,1) = {" @@ -146,7 +150,7 @@ K Q "} (3,1,1) = {" -k +j f A S @@ -183,18 +187,18 @@ a I N e -I +j K Q "} (6,1,1) = {" -k -a +j +W a a a a -I +j a Y V @@ -203,12 +207,12 @@ Q "} (7,1,1) = {" k -W +j a a a U -I +j P u u @@ -218,14 +222,14 @@ Q (8,1,1) = {" d k -k -k -k -k -k -k -k -k +j +j +j +j +j +j +j +j k d "} diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm index 863e26411a6e..ea7092669dd4 100644 --- a/_maps/templates/shipbreaker/old_robotics.dmm +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -3,8 +3,7 @@ /turf/template_noop, /area/template_noop) "c" = ( -/obj/structure/window/plastitanium, -/obj/structure/window/plastitanium, +/obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/template_noop) "i" = ( @@ -16,23 +15,23 @@ /turf/open/floor/plating, /area/template_noop) "n" = ( -/obj/machinery/shuttle/engine/void, +/obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating, /area/template_noop) "o" = ( /turf/open/floor/engine/airless, /area/template_noop) "r" = ( -/obj/structure/window/plastitanium, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/oil, +/obj/item/organ/cyberimp/chest/spinalspeed/toy, +/turf/open/floor/engine/airless, /area/template_noop) "s" = ( -/obj/machinery/door/airlock/external/glass, +/obj/structure/shuttle/engine/propulsion/left, /turf/open/floor/plating, /area/template_noop) "t" = ( -/obj/item/organ/cyberimp/chest/spinalspeed/toy, -/turf/open/floor/engine/airless, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/template_noop) "v" = ( /obj/effect/decal/cleanable/oil, @@ -45,6 +44,10 @@ "x" = ( /turf/closed/wall/mineral/titanium, /area/template_noop) +"A" = ( +/obj/structure/shuttle/engine/propulsion/right, +/turf/open/floor/plating, +/area/template_noop) "D" = ( /obj/machinery/mecha_part_fabricator, /turf/open/floor/engine/airless, @@ -109,6 +112,10 @@ /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating, /area/template_noop) +"N" = ( +/obj/machinery/door/airlock/external/glass, +/turf/open/floor/engine/airless, +/area/template_noop) "X" = ( /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /turf/open/floor/engine/airless, @@ -141,31 +148,31 @@ a a a x -x +t m m m -x -x +t +t x a "} (3,1,1) = {" x -x -x -x +t +t +t Z o -v +r o K I -x -a +L +s "} (4,1,1) = {" -r +c E Y i @@ -194,29 +201,29 @@ n "} (6,1,1) = {" x -x -x -x +t +t +t G t -o -o +N +t w X -x -a +L +A "} (7,1,1) = {" a a a x -x -x -s -x -x -x +t +t +o +t +t +t x a "} @@ -226,9 +233,9 @@ a a a a -a -a -a +x +N +x a a a diff --git a/_maps/templates/shipbreaker/old_syndicate.dmm b/_maps/templates/shipbreaker/old_syndicate.dmm index 258f1850011d..67fc5acf7041 100644 --- a/_maps/templates/shipbreaker/old_syndicate.dmm +++ b/_maps/templates/shipbreaker/old_syndicate.dmm @@ -8,23 +8,64 @@ /turf/open/floor/plating, /area/template_noop) "c" = ( -/obj/machinery/door/airlock/external/glass, +/obj/structure/window/reinforced/spawner/west, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) +"e" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Storage and Crew Quarters"; + req_access_txt = "150" + }, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) +"f" = ( +/obj/structure/showcase/machinery/oldpod/used{ + icon_state = "sleeper_s-open"; + dir = 8; + name = "old prisoner pod"; + desc = "A cryogenic pod used to hold prisoners for long-term transport." + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) "g" = ( -/obj/structure/closet/syndicate, -/turf/open/floor/mineral/plastitanium/red/airless, +/obj/machinery/door/airlock/highsecurity{ + name = "Bridge"; + req_access_txt = "150" + }, +/turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "h" = ( /obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/template_noop) +"i" = ( +/obj/structure/shuttle/engine/propulsion/right, +/turf/open/floor/plating, +/area/template_noop) +"l" = ( +/obj/structure/shuttle/engine/propulsion/left, +/turf/open/floor/plating, +/area/template_noop) +"m" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"n" = ( +/obj/item/restraints/handcuffs/cable/zipties/used, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) "o" = ( /obj/machinery/modular_computer, /turf/open/floor/mineral/plastitanium, /area/template_noop) "p" = ( -/obj/item/restraints/handcuffs/cable/zipties/used, +/obj/structure/window/reinforced/spawner/west, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "t" = ( @@ -34,6 +75,12 @@ "u" = ( /turf/template_noop, /area/template_noop) +"v" = ( +/obj/structure/window/reinforced/spawner/west, +/obj/structure/closet/syndicate, +/obj/item/clothing/under/syndicate/tacticool, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) "w" = ( /obj/item/restraints/handcuffs/cable/zipties/used, /turf/open/floor/mineral/plastitanium/red/airless, @@ -46,16 +93,32 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) +"C" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) +"D" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) "E" = ( /turf/closed/wall/mineral/plastitanium, /area/template_noop) "F" = ( -/obj/item/bodybag/environmental/prisoner/syndicate, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/north, /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) "H" = ( -/obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/airless/broken, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/template_noop) "J" = ( /obj/item/storage/box/zipties, @@ -65,60 +128,97 @@ /turf/open/floor/mineral/plastitanium/red, /area/template_noop) "M" = ( -/obj/machinery/shieldwallgen, -/turf/open/floor/mineral/plastitanium/airless/broken, +/obj/machinery/door/airlock/external/glass{ + req_access_txt = "150" + }, +/turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) -"P" = ( -/obj/structure/chair/comfy/shuttle, +"O" = ( +/obj/structure/showcase/machinery/oldpod/used{ + icon_state = "sleeper_s-open"; + dir = 8; + name = "old prisoner pod"; + desc = "A cryogenic pod used to hold prisoners for long-term transport." + }, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) +"P" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/north, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) "Q" = ( /turf/open/floor/mineral/plastitanium/airless/broken, /area/template_noop) -"U" = ( -/obj/machinery/shieldwallgen, +"R" = ( +/obj/structure/closet/syndicate, +/obj/item/bodybag/environmental/prisoner/syndicate, +/obj/item/bodybag/environmental/prisoner/syndicate, +/obj/item/bodybag/environmental/prisoner/syndicate, +/obj/structure/window/reinforced/spawner, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) +"U" = ( +/obj/structure/window/reinforced/spawner, +/obj/machinery/door/window{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) "V" = ( /obj/item/bodybag/environmental/prisoner/syndicate, /turf/open/floor/mineral/plastitanium/red/airless, /area/template_noop) +"Y" = ( +/obj/machinery/door/window, +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/turf/open/floor/mineral/plastitanium/red/airless, +/area/template_noop) +"Z" = ( +/obj/machinery/sleeper/syndie{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/airless/broken, +/area/template_noop) (1,1,1) = {" -E -E -E -E -E -c -E -E -E -E +h +h +h +H +H +M +H +H +H +H E u "} (2,1,1) = {" -E -Q -Q +h +x Q -E +Z +H +a +H a -E -U a J b -t +l "} (3,1,1) = {" -E -Q -Q +h +o +D Q -E -c +H +M E V w @@ -127,13 +227,13 @@ b t "} (4,1,1) = {" -h -x H -Q -Q +H +H +g +H a -L +m a a a @@ -141,11 +241,11 @@ b t "} (5,1,1) = {" -h -o -P +H +Y a -Q +a +e a L B @@ -155,13 +255,13 @@ b t "} (6,1,1) = {" -E -a +H +R a a -E +H c -E +U Q F p @@ -170,29 +270,29 @@ t "} (7,1,1) = {" E -g -a -V -E -a -E -M -Q +H +v +C +H +O +f Q +P +n b -t +i "} (8,1,1) = {" +u E -E -E -E -E -c -E -E -E -E +H +H +H +H +H +H +H +H E u "} diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index 18995689fff1..a3be8fcd3eb9 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -45,7 +45,7 @@ /obj/machinery/computer/shipbreaker/proc/area_clear_check() for(var/turf/t in linked) - if(!isspaceturf(t)) + if(!isspaceturf(t) && isstructure(t)) spawn_area_clear = FALSE return From 584b2c02adb5450d197f14e650b66fa3fbce00c0 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 16:54:52 -0400 Subject: [PATCH 14/18] ok fr --- code/modules/shipbreaker/shipbreak_console.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index a3be8fcd3eb9..3305546d5cff 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -45,7 +45,7 @@ /obj/machinery/computer/shipbreaker/proc/area_clear_check() for(var/turf/t in linked) - if(!isspaceturf(t) && isstructure(t)) + if(!isspaceturf(t) || isstructure(t)) spawn_area_clear = FALSE return From ec13c5d941e26be0a361f24a68f4a664b0470418 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 17:18:10 -0400 Subject: [PATCH 15/18] OK NO MORE GIRDERS --- code/modules/shipbreaker/shipbreak_console.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/shipbreaker/shipbreak_console.dm b/code/modules/shipbreaker/shipbreak_console.dm index 3305546d5cff..a166f2dbf120 100644 --- a/code/modules/shipbreaker/shipbreak_console.dm +++ b/code/modules/shipbreaker/shipbreak_console.dm @@ -45,7 +45,11 @@ /obj/machinery/computer/shipbreaker/proc/area_clear_check() for(var/turf/t in linked) - if(!isspaceturf(t) || isstructure(t)) + if(!isspaceturf(t)) + spawn_area_clear = FALSE + return + for(var/obj/s in linked) + if(isstructure(s) || ismachinery(s)) spawn_area_clear = FALSE return From e8f68fe9515a094f7f22b58e415305a35dbbd639 Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 18:47:42 -0400 Subject: [PATCH 16/18] updates ship consoles --- _maps/templates/shipbreaker/old_nt.dmm | 2 +- _maps/templates/shipbreaker/old_robotics.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/templates/shipbreaker/old_nt.dmm b/_maps/templates/shipbreaker/old_nt.dmm index 1d9bce579a8a..5f9e4317f903 100644 --- a/_maps/templates/shipbreaker/old_nt.dmm +++ b/_maps/templates/shipbreaker/old_nt.dmm @@ -51,7 +51,7 @@ /turf/open/floor/mineral/titanium/airless, /area/template_noop) "D" = ( -/obj/machinery/computer/shuttle, +/obj/machinery/modular_computer, /turf/open/floor/plating, /area/template_noop) "G" = ( diff --git a/_maps/templates/shipbreaker/old_robotics.dmm b/_maps/templates/shipbreaker/old_robotics.dmm index ea7092669dd4..a405899b73e8 100644 --- a/_maps/templates/shipbreaker/old_robotics.dmm +++ b/_maps/templates/shipbreaker/old_robotics.dmm @@ -53,7 +53,7 @@ /turf/open/floor/engine/airless, /area/template_noop) "E" = ( -/obj/machinery/computer/rdconsole/robotics, +/obj/machinery/modular_computer, /turf/open/floor/engine/airless, /area/template_noop) "F" = ( From 6ef9bcece134342ec0972bd3992e30f64b1955ba Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 19:05:07 -0400 Subject: [PATCH 17/18] marker beacons --- _maps/map_files/YogStation/YogStation.dmm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index cbbb07191b26..b68f2594f1a5 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -74621,6 +74621,12 @@ }, /turf/open/floor/plasteel, /area/storage/primary) +"yip" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/obj/structure/marker_beacon, +/turf/open/floor/catwalk_floor, +/area/space/nearstation) "yiM" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -125286,7 +125292,7 @@ aaa aaa aaa aaa -ruv +yip nXe nXe nXe @@ -125299,7 +125305,7 @@ nXe nXe nXe nXe -ruv +yip rkA rkA aaa @@ -127599,7 +127605,7 @@ aaa aaa aaa aaa -ruv +yip nXe nXe nXe @@ -127612,7 +127618,7 @@ ruv nXe nXe nXe -ruv +yip aaa aaa aaa From 51ffd9be7d946aac67ab6cec54f2668d00357edf Mon Sep 17 00:00:00 2001 From: cowbot92 <75333826+cowbot92@users.noreply.github.com> Date: Wed, 15 May 2024 22:46:00 -0400 Subject: [PATCH 18/18] yes chef --- _maps/map_files/YogStation/YogStation.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index b68f2594f1a5..23fd3150b6ea 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -37893,9 +37893,7 @@ dir = 4; id = "garbage" }, -/obj/machinery/recycler{ - can_be_unanchored = 1 - }, +/obj/machinery/recycler, /obj/structure/sign/warning/securearea{ name = "\improper STAY CLEAR HEAVY MACHINERY"; pixel_y = 32