From 82b19bbbac2f3c8b5c4639a1ec8e7d808432f6b3 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:42:22 -0700 Subject: [PATCH 01/38] big gun half done --- .../tiziran_raider_shuttle.dmm | 1499 +++++++++++++++++ .../modular_weapons/code/guns/naval_gun.dm | 66 + .../modular_weapons/icons/obj/guns32x.dmi | Bin 2509 -> 4532 bytes .../modular_weapons/icons/projectiles.dmi | Bin 697 -> 1401 bytes tgstation.dme | 1 + .../modular_doppler_tsx/SnubProtonCannon.tsx | 85 + 6 files changed, 1651 insertions(+) create mode 100644 _maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm create mode 100644 modular_doppler/modular_weapons/code/guns/naval_gun.dm create mode 100644 tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm new file mode 100644 index 00000000000000..6fcc35ad0bdc0c --- /dev/null +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -0,0 +1,1499 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ao" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"bn" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"cv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"cE" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/space) +"do" = ( +/obj/machinery/turretid{ + ailock = 1; + desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + icon_state = "control_kill"; + lethal = 1; + name = "Ship Turret Control"; + pixel_x = 30; + pixel_y = 4; + req_access = list("syndicate") + }, +/obj/machinery/shuttle_scrambler, +/turf/open/floor/iron/dark/textured, +/area/space) +"dO" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/space) +"ee" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) +"ex" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/space) +"eY" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/plating, +/area/space) +"fA" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 6 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/smooth_corner, +/area/space) +"fF" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"gG" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/iron/dark/textured, +/area/space) +"ht" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"iJ" = ( +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"jl" = ( +/obj/machinery/power/micro_reactor, +/turf/open/floor/iron/dark, +/area/space) +"kd" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"kC" = ( +/obj/structure/minecart_rail, +/turf/template_noop, +/area/space) +"lr" = ( +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/space) +"lS" = ( +/obj/item/radio/intercom/syndicate/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"nD" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"oS" = ( +/obj/machinery/vending/imported/tiziran, +/turf/open/floor/plating, +/area/space) +"pF" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"pO" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"pW" = ( +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"qc" = ( +/obj/structure/chair/bronze, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"qm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"qp" = ( +/obj/structure/girder/reinforced, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/space) +"rA" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/space) +"te" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control" + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"tX" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"uo" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"vw" = ( +/obj/machinery/loot_locator, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"vV" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/plating, +/area/space) +"wF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"wI" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"xm" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"yj" = ( +/obj/machinery/computer/shuttle/pirate{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured, +/area/space) +"zk" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) +"zv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"zT" = ( +/obj/structure/railing/eva_handhold/directional/east, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"zX" = ( +/obj/structure/shelf, +/turf/open/floor/plating, +/area/space) +"Ag" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/space) +"At" = ( +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/space) +"AC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/space) +"AT" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"Ba" = ( +/turf/open/floor/iron/dark, +/area/space) +"Bf" = ( +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"Bi" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/space) +"Bm" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space) +"Dl" = ( +/obj/structure/fluff/sat_dish, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"Dv" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"DB" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"Em" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"EI" = ( +/obj/structure/minecart_rail, +/obj/structure/marker_beacon/burgundy{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/structure/marker_beacon/olive{ + pixel_x = -6; + pixel_y = -14 + }, +/turf/template_noop, +/area/space) +"Fd" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"GI" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"In" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"Is" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/iron/dark, +/area/space) +"IB" = ( +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 + }, +/turf/open/floor/plating, +/area/space) +"IS" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"Ja" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"Je" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"JW" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/space) +"LG" = ( +/turf/open/floor/plating, +/area/space) +"LS" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"MZ" = ( +/turf/template_noop, +/area/space) +"QC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"Rf" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Sf" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plating, +/area/space) +"SA" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/space) +"SG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"SI" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"Ti" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"Tu" = ( +/obj/structure/shelf, +/obj/item/melee/tizirian_sword{ + pixel_x = -10 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = -3 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = 5 + }, +/turf/open/floor/plating, +/area/space) +"Tv" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"TK" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Un" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"VR" = ( +/obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"VT" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 1; + x_offset = 12; + y_offset = 5; + view_range = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"VY" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"WA" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Xw" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"XN" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"Yq" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/plating, +/area/space) +"YF" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) + +(1,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(2,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +ht +TK +SI +In +In +bn +MZ +MZ +MZ +bn +In +In +Bf +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(3,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +Rf +In +LG +LG +In +bn +bn +bn +In +LG +Bm +In +bn +MZ +MZ +MZ +MZ +MZ +MZ +"} +(4,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +In +WA +In +wF +wF +kd +zv +XN +lr +LG +LG +LG +Bm +In +bn +MZ +MZ +MZ +MZ +MZ +"} +(5,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +Sf +LG +Em +LG +wF +LG +In +LG +LG +Bm +LG +LG +LG +LG +Bm +In +Bf +MZ +MZ +MZ +MZ +"} +(6,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +wF +wF +wF +wF +wF +wF +LG +AC +LG +Bm +Bm +Bm +lr +lr +LG +LG +Bm +In +bn +MZ +MZ +MZ +"} +(7,1,1) = {" +MZ +MZ +MZ +MZ +MZ +bn +In +LG +wF +LG +LG +LG +LG +In +bn +bn +In +LG +LG +LG +LG +Bm +Bm +LG +LG +Bm +In +bn +MZ +MZ +"} +(8,1,1) = {" +MZ +MZ +MZ +MZ +nD +In +oS +LG +wF +LG +LG +LG +In +bn +MZ +MZ +bn +In +In +In +In +In +In +In +In +In +In +In +bn +MZ +"} +(9,1,1) = {" +MZ +MZ +Ag +tX +In +GI +LG +LG +wF +In +In +In +Bf +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(10,1,1) = {" +MZ +MZ +Ag +tX +cE +IB +iJ +In +kd +In +pW +pW +Ja +Je +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(11,1,1) = {" +MZ +Ag +tX +In +In +In +In +In +wF +In +gG +In +bn +pW +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(12,1,1) = {" +MZ +Ag +tX +Bi +Ba +In +IS +wF +ee +Rf +Rf +LS +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(13,1,1) = {" +MZ +Ag +tX +QC +Ba +In +Xw +wF +Rf +VY +xm +Tv +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(14,1,1) = {" +MZ +bn +In +ao +In +In +In +wF +fA +ex +VY +Un +AC +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(15,1,1) = {" +MZ +bn +Ba +QC +pO +Bi +In +VR +AT +YF +zk +te +LS +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(16,1,1) = {" +MZ +bn +rA +QC +QC +QC +kd +cv +qc +wI +At +SA +yj +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(17,1,1) = {" +MZ +bn +Is +QC +jl +jl +In +lS +Ti +fF +zk +pF +VT +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(18,1,1) = {" +MZ +bn +In +ao +In +In +In +wF +JW +dO +uo +vw +AC +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(19,1,1) = {" +MZ +Ag +tX +QC +Bi +Ba +In +qm +wF +uo +Dv +Fd +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(20,1,1) = {" +MZ +Ag +tX +Ba +Ba +Ba +In +Rf +ee +Rf +Rf +do +AC +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(21,1,1) = {" +MZ +Ag +tX +In +In +In +In +In +wF +Rf +Rf +In +bn +kC +EI +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(22,1,1) = {" +MZ +MZ +Ag +tX +DB +SG +LG +In +kd +In +In +bn +Dl +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(23,1,1) = {" +MZ +MZ +Ag +tX +In +SG +SG +SG +wF +LG +LG +In +Bf +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} +(24,1,1) = {" +MZ +MZ +MZ +MZ +nD +In +LG +LG +wF +LG +LG +LG +In +bn +MZ +MZ +bn +In +In +In +In +In +In +In +In +In +In +In +bn +MZ +"} +(25,1,1) = {" +MZ +MZ +MZ +MZ +MZ +bn +In +LG +wF +LG +LG +LG +LG +In +bn +bn +In +LG +LG +LG +LG +Bm +LG +LG +LG +Bm +In +bn +MZ +MZ +"} +(26,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +wF +wF +wF +wF +wF +wF +wF +kd +wF +wF +XN +LG +LG +qp +Bm +LG +Bm +In +bn +MZ +MZ +MZ +"} +(27,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +LG +LG +Yq +vV +vV +vV +In +In +WA +In +Bm +Bm +lr +LG +Bm +In +Bf +MZ +MZ +MZ +MZ +"} +(28,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +LG +eY +LG +LG +LG +In +LG +Em +In +lr +LG +LG +Bm +In +bn +MZ +MZ +MZ +MZ +MZ +"} +(29,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +Tu +zX +zX +zX +In +zT +TK +zT +In +LG +Bm +In +bn +MZ +MZ +MZ +MZ +MZ +MZ +"} +(30,1,1) = {" +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +MZ +bn +In +In +In +In +bn +MZ +MZ +MZ +bn +In +In +Bf +MZ +MZ +MZ +MZ +MZ +MZ +MZ +"} diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm new file mode 100644 index 00000000000000..c48bd3eb36a25c --- /dev/null +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -0,0 +1,66 @@ +/* +* basically a cross between the skeleton pirates' cannon and the BSA mechanically, or a proton cannon that's been obrezed. +* this fires explosive projectiles with limited range before bursting, sucks a ton of power off the shuttle's power grid to do so, +* and has a moderate cooldown. +*/ + +/obj/machinery/snub_particle_cannon + name = "snub nose proton cannon" + desc = "A weaponized particle accelerator that fires balls of hyper-energized protons. Originally built to fit ships much \ + larger than this, this one has had most of its barrel and much of its cooling systems removed." + icon = 'modular_doppler/modular_weapons/icons/obj/guns32x.dmi' + icon_state = "snub_nose_ppc" + density = TRUE + circuit = null + /// how much energy we take out of the grid when we fire a shot. uses WATTS + var/power_draw_per_shot = 2000 WATTS + /// what comes out of our barrel + var/projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt + /// whether we're on cooldown + var/ready_to_fire = TRUE + +/obj/machinery/snub_particle_cannon/wrench_act(mob/living/user, obj/item/tool) + . = ..() + return FALSE + +/obj/machinerysnub_particle_cannon/proc/fire() + var/obj/projectile/fired_bolt = new projectile_type(get_turf(src)) + use_energy(power_draw_per_shot) + +/obj/projectile/energy/snub_particle_cannon_bolt + name = "energized proton bolt" + icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' + icon_state = "ppc_bolt" + +/obj/machinery/computer/snub_particle_cannon_controller + name = "fire control system" + desc = "The computerized control system for the ship's mounted proton cannon." + icon_screen = "syndishuttle" + icon_keyboard = "tcboss" + /// weakref for our attached gun + var/datum/weakref/snub_particle_cannon + /// mapping id for our attached gun + var/mapping_id + /// tells us if the cannon is working + var/cannon_info + +/obj/machinery/computer/snub_particle_cannon_controller/post_machine_initialize() + . = ..() + if(!mapping_id) + return + for(var/obj/machinery/snub_particle_cannon/cannon as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/snub_particle_cannon)) + if(cannon.mapping_id != mapping_id) + continue + register_machine(cannon) + break + +/obj/machinery/computer/snub_particle_cannon_controlle/ui_state(mob/user) + return GLOB.physical_state + +/obj/machinery/computer/snub_particle_cannon_controlle/ui_interact(mob/user, datum/tgui/ui) + . = ..() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "SnubProtonCannon", name) + ui.open() + diff --git a/modular_doppler/modular_weapons/icons/obj/guns32x.dmi b/modular_doppler/modular_weapons/icons/obj/guns32x.dmi index 9b3e4e632f1df113c1610dee15310d5a89c47f0d..08766d3281773219dfd16e57087c4cfa0134f9bb 100644 GIT binary patch literal 4532 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 literal 2509 zcmb7?c{Cf?9>+0^ZIn_$QAR6T5izAytIQ0oirQ+Ygw|TpXl<1y(M}gFqe=xGOQ?Md zscMQwy4j}*Qb{$97=l5F*b*X)dGF1<_s;w4{m!}fd%ySG@4e@D&*y==tD};_egz2$ z2_>hq4(E5Z^v@yp_3oTOjRfz?2c(x@f)5hh24wPM<=a4N>R zZI(G1PfPg_(UQb3C#H@F0lv&5XuM`iq!fjf*zVK?pN6n5%X((AVqSouco13erxV)|jlWJ${0Oti^Rza`t>$?7Jq zn|2)jI%9^yFvYB{^Nc!kT;-#w-rSm_L$!~MfLrP6S#c!#9{2U+;RRCgXYDI*d465X zs{vrDq6Q_g$dM@MKD8TcQibIv&{gL`YOc+F=MgR$AxLe-qLPx4(yv~bk@1B?-6MP5 z>08=xiG^Nce*c8sl29$$`J!W?n^YkG3JaGuPRh-!luMQ6ZG z$ZXe@#ZeiMaDljZZcNNrONgL9H;$^#1aIG;f9_G&ETryiMm$DR4g?Lh99!^c5pdhDFRo|P?` zAIe&_j(4(a^6q%>;gM(HJHa9tVZq=%1Ys4Vw)EyUET-~}BDdGg_j+P$WQ%PS4F+Hn zZNm8juFqu`HWOqn*wkh{gk&?x&@GH<(h1W73mkm@Q_J)LbTcQgE}2tJnIwu!|nq(Y1RGuV5r5pB>})?r>n)?rxJ^SZs?XNg1jAd&VD|!}>|d5q!PT<4Oa1S(s!`#^{9T6JP-1 zOXh=IR=Lzp*7@bp55wVWzjZYf;grL-QiUIJpstp=U-HIp10PM7r^Mcs z{!(W=BI`A=TBlr{M-6B{${JIfuNn#0JB2bCvL_mjnV-zJ*%~YdpK3VCTeZHyzSnrc ze{{y|0Me&Nm36Q#&&{bu6|L;u-&Vqp1qkM9wZ-gSM?7?s7nj@7TlOs{|yC@_Pm-K z&MN7%SyZF#H;z4kW>55S0zF!DZ8qI0Og?hhl*l?Cpibcy;g@)-cPg|~FL~>^H{z7) z*Un3A?AV8}ymC4oof(AwUhG@)ES@-_(buVZQvN=?3xg)WBA@10Q;fy?($*}Osj%jI(hi3y z#b1ZalwX$FIHmPBRsUGTCS!LBuGQ14>*uVpbbqDq6bh!<9b3bnchT4-Bk?dF9h)(g zAM=TyF%UBF9d}Lkzw^89wQ#&U8@{+aHBiRiu=`f-w3NX<`TOpN^nc90`9J0(rB3Y( zqgph}CHbS7plz> z3CA#@5mh5M`jPsQd+U}3H#L<57euE6{(VNJ>^}nkr>UESKXJ@rvrnM7*VmB|i)R^H zUscmQphm zRWW67_Q%yrGrF0xbWRDWZ%&qHG{DGv25@~RjYxCwi0vWFVqoY33#!JeI@^ixJEu8(EGuacFB!nH)&nIv*CgpFs?&*{_v2WMNQ z`eT6s7!X`5W9HU6x-5VMQf%V1`=nxK(<<>Sh@~%bPgLLdW48xkJoWYgpV5sH!#I(3 zVSY(t*UCHOw6SK6vs7Y67Y77P7duqr8LHX1@j1|@j#;w$g;y6B=um$~;5tpm-P=@h z2NxI3@Sj@748mL_S{9o^k;R1@xcMkag2z|heFAclgtkYAqU?_7S&&&!P*D>L`Ev%L xU9R@_MB5Rz5nUVHW2wQCy5=VLFJwRNNL1Bo%7&P9y8el~(`i=+{Es0&{Q)&!^#uR` diff --git a/modular_doppler/modular_weapons/icons/projectiles.dmi b/modular_doppler/modular_weapons/icons/projectiles.dmi index e05c6dfdf3e18245b3a7d30310bfbe4c51fa2381..d25d9e40b1650a397ca34b253fddb0eb080033fa 100644 GIT binary patch delta 1295 zcmV+q1@QX01^EgkiBL{Q4GJ0x0000DNk~Le0001B0001B2nGNE0OFW;H~;_uoslJc ze>v-l%In`p$SklH7BtWB&-95T*?ZrelFl30RSO>Q2}7(d58c21eZxfK~#90 z?VK@a6hRb*cO|JUw2BrftSq9bgec?^l0pO#C2%5Y8XK*w6tNW1N)WV;ig+Lq8?gwO zD>P^o6YN9?!K6_OZAH%fD=$ngQM2>*f9Bt}Hy?yqE^zPd{PSkt%)Ys_*=#1h3=a>t z(lxxlU=59ZaBk{Z>*3_dbsuWAn(F)7`JaD#m(H|4_doWwzr)9=vVhJ%a(XCh8TQfn zyAK@BTHo(5EdVV<0?f|NZn^pOx6jLL-=qLl zA__nz3P2_bKqd-6MkT<9`Q@Vgf9P6b1duT;!1C1H)NMnvZ*nDdTOUjdPz8E?>u9v~ zJdr=d2q0r#0NDv;Av>YIm=}Oa5!0|~0jlsEGA)2$S%^vqV3{aD0cavHWuFh|c47pO zi2{&`0+5Ndp=5#-GIfGo1N99hAm0`nL6d<~SDv>92M;Fm^Y4@9%Z9gof0I)XI{)&u zTZ#PDj@CB`(rNqB`Do=cpYJj!fZXWNz@DrF@OSC_u}lbz$`JM;IP3%1f7*DI+4m8_ z+!TbH$Edsa;6>K)0M`JYPY3W}EBg`&c`+9O68hWyyzHnVfKe48^Dd?U8TlBA6ZNw} z{eVr^zFg6I0@nv$%te6Y`WXGVafyJ? zoiEV`A8_r9N&v?EFLUkndO!6&gliwyU9%DvZZwuCzY!!6=-S71e^>1V0c0MU(Dy|m zP!@e!A502>Q79duc>rpFeX*^X4owOmlws>Z>w`G~+|lp5_$k5%xzS~Cj)0J_A={BoXHA9l2q**00Z8~sTSjX%$08pm@e>O1!iotXQRDp6VDu}QnIYt1PC;*u#0GTKN8Sk=`suV`C@rnSs zdACMCbbUTrw?^OUqAa%ncp-rfM?tF8=S!`8h)$5h8K}vZ*MYDf`jAFZU*S=M9XF*a3i<)>D z@#qB2Nx{7Kn@Q3V+i2x*M(9ke2)rF;r=dk16E(XRBsa{e&zF-j)={m5izv_5&|ac$ zk+>B>CJI1CbwsHQdB5xjg*c$y2~+}L3xN3`lnlu7IzTlAjqdMFDN};y?k! zX8;+M09XtmVf|1>q1Jn_KmKg!A9~MywP?qeY zEPnW)&Vq_^L_=Bp@F8YFWTF6Mq5x!~0A!*7WTF6Megk5IP>Cdv6kh-U002ovPDHLk FV1g|lO)>xg delta 586 zcmV-Q0=5153b_R(iBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-T(jqhmj?G zfBX(mR&e!m0ecJpHdH|-KQm0h0005)Nklvx`%4aBz1Ns*psI z)j@C&LAtp3aU7hBAZ~tvfXSeulN4M9DcZ@!StRBn(JQDW?>+kWHTPRyDctqlFRz!& zUA!#IT2y@B&%FY22L+tpH|+P%^ON58e^(Ac5Y%cv$NF_JX7C%k-7-@9XiFwEZOq^g z*E+?gF1ZiY6(E6X0iRd@J5o?BKmyeQj&Da}k%DRg60ii^JPf4rfZ-|todAV6j_0NN zQYj!wk~gWoR0;^guw46Jo?W->7)4R-m90tvHuf#>y`XM;l>*W<{qf=Fx9|T#f29CP zoB(tJXq*6a0%%wQ?(c?DdBAWLfKGtJuz%#)k%DRg613~?qgQbE^ZyHtuK@J|swY7z z>IHC7EkI%(QZ1l@BVr~5aA>@Mi7Ti{<+b#z~NwLi?tVEP%S_LCjgxQ z8Ycjq02-EnmEN;wM~yVT0^n1y>Pb*5ECI9dnvDAkpc6pj90W*oqIoX( Y0A`Sc@6Bd|IsgCw07*qoM6N<$f~Tth3;+NC diff --git a/tgstation.dme b/tgstation.dme index 6fa04365882db5..920033be8d980d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7571,6 +7571,7 @@ #include "modular_doppler\modular_weapons\code\guns\cargo.dm" #include "modular_doppler\modular_weapons\code\guns\crankin_my.dm" #include "modular_doppler\modular_weapons\code\guns\marcielle.dm" +#include "modular_doppler\modular_weapons\code\guns\naval_gun.dm" #include "modular_doppler\modular_weapons\code\guns\NO_MORE_BATTLE_RIFLE.dm" #include "modular_doppler\modular_weapons\code\guns\pulse_rifle.dm" #include "modular_doppler\modular_weapons\code\guns\revolvers.dm" diff --git a/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx b/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx new file mode 100644 index 00000000000000..fc01b2748c80da --- /dev/null +++ b/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx @@ -0,0 +1,85 @@ +import { + Box, + Button, + LabeledList, + NoticeBox, + Section, +} from 'tgui-core/components'; +import type { BooleanLike } from 'tgui-core/react'; + +import { useBackend } from '../backend'; +import { Window } from '../layouts'; + +type Data = { + connected: BooleanLike; + notice: string; +}; + +export const SnubProtonCannon = (props) => { + const { act, data } = useBackend(); + const { notice, connected } = data; + + return ( + + + {!!notice && {notice}} + {connected ? ( + <> +
act('recalibrate')} + /> + } + > + + {target || 'No Target Set'} + +
+
+ {unlocked ? ( + +
+ + ) : ( +
+ + +
+ )} + + + ); +}; From b4818daab9ccfb70d65104471933edda774371f6 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Thu, 16 Oct 2025 18:42:22 -0700 Subject: [PATCH 02/38] little gun half done --- .../modular_weapons/code/guns/bolt_thrower.dm | 12 +++++++++++ .../modular_weapons/code/guns/naval_gun.dm | 19 +++++++++++++++--- .../modular_weapons/icons/obj/guns48x.dmi | Bin 3090 -> 3908 bytes tgstation.dme | 1 + .../modular_doppler_tsx/SnubProtonCannon.tsx | 4 ++-- 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 modular_doppler/modular_weapons/code/guns/bolt_thrower.dm diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm new file mode 100644 index 00000000000000..34434154368ff8 --- /dev/null +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -0,0 +1,12 @@ +/* +* a tiziran gauss rifle that accelerates steel shot to lethal velocity with the power of electromagnetism. it's for pirates to kill people with. +* mechanically, this isn't that different from a sakhno +*/ + +/obj/item/gun/ballistic/rifle/bolt_thrower + name = "bolt thrower" + desc = "Tiziran small arms often feature gauss or rail gun style electromagnetic drivers in an effort to prevent \ + errant sparks from igniting low lying puddles of subterranean gasses. Ironically, since the drivers are easily and \ + frequently tuned hot by the end users, they end up causing ignitions anyway when hypersonic projectiles hit still air." + icon = 'modular_doppler/modular_weapons/icons/obj/guns48x.dmi' + icon_state = "bolt_thrower" diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index c48bd3eb36a25c..d1ed85f6961158 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -16,14 +16,16 @@ var/power_draw_per_shot = 2000 WATTS /// what comes out of our barrel var/projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt - /// whether we're on cooldown + /// can we shoot or are we on cooldown? var/ready_to_fire = TRUE + /// our id to link with our firing computer + var/mapping_id /obj/machinery/snub_particle_cannon/wrench_act(mob/living/user, obj/item/tool) . = ..() return FALSE -/obj/machinerysnub_particle_cannon/proc/fire() +/obj/machinery/snub_particle_cannon/proc/fire() var/obj/projectile/fired_bolt = new projectile_type(get_turf(src)) use_energy(power_draw_per_shot) @@ -41,7 +43,7 @@ var/datum/weakref/snub_particle_cannon /// mapping id for our attached gun var/mapping_id - /// tells us if the cannon is working + /// tells us if the cannon is working/present var/cannon_info /obj/machinery/computer/snub_particle_cannon_controller/post_machine_initialize() @@ -64,3 +66,14 @@ ui = new(user, src, "SnubProtonCannon", name) ui.open() +/obj/machinery/computer/bsa_control/ui_data() + var/obj/machinery/snub_particle_cannon/cannon = snub_particle_cannon?.resolve() + var/list/data = list() + data["ready"] = cannon ? cannon.ready_to_fire : FALSE + data["cannoninfo"] = cannon_info + return data + +/obj/machinery/computer/snub_particle_cannon_controller/proc/register_machine(/obj/machinery/snub_particle_cannon/cannon) + PRIVATE_PROC(TRUE) + + snub_particle_cannon = WEAKREF(cannon) diff --git a/modular_doppler/modular_weapons/icons/obj/guns48x.dmi b/modular_doppler/modular_weapons/icons/obj/guns48x.dmi index caaf6820398780a4953fdddfd1ef48bca15e8c13..28c71017503c922cbab82e4169169ce1efcf8461 100644 GIT binary patch delta 3840 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 { From a26fa2db4c6d98e3945fe7465a19698b88dbdec3 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:12:00 -0700 Subject: [PATCH 03/38] almost done... --- .../__DEFINES/~doppler_defines/projectiles.dm | 2 + .../sound/items/bolt_thrower.ogg | Bin 0 -> 27931 bytes .../modular_weapons/code/ammo/bolt_shot.dm | 45 ++++++++++++++++++ .../modular_weapons/code/guns/bolt_thrower.dm | 23 +++++++-- .../modular_weapons/code/guns/naval_gun.dm | 4 +- .../modular_weapons/icons/obj/casings.dmi | Bin 2256 -> 2588 bytes .../modular_weapons/icons/projectiles.dmi | Bin 1401 -> 1946 bytes tgstation.dme | 1 + 8 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg create mode 100644 modular_doppler/modular_weapons/code/ammo/bolt_shot.dm diff --git a/code/__DEFINES/~doppler_defines/projectiles.dm b/code/__DEFINES/~doppler_defines/projectiles.dm index cf2f28d9d59b88..5576d6f5f9dff2 100644 --- a/code/__DEFINES/~doppler_defines/projectiles.dm +++ b/code/__DEFINES/~doppler_defines/projectiles.dm @@ -12,3 +12,5 @@ /// Special Calibers #define CALIBER_980TYDHOUER ".980 Tydhouer" + +#define CALIBER_BOLT_THROWER "Machined Bolt" diff --git a/modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg b/modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ae565b082cfc6304f7c5dfaf2ef5289a0101b311 GIT binary patch literal 27931 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 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm new file mode 100644 index 00000000000000..0201ed9fb1b899 --- /dev/null +++ b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm @@ -0,0 +1,45 @@ +/* +* machined shot for the tiziran gauss rifle +*/ + +/obj/item/ammo_casing/bolt_slug + name = "machined slug" + desc = "A solid lathe turned slug of ferrous alloy, ready to be shunted through a hot coil wrap and deep into something or \ + someone unfortunate."" + icon = 'modular_doppler/modular_weapons/icons/obj/casings.dmi' + icon_state = "machined_bolt" + caliber = CALIBER_BOLT_THROWER + projectile_type = /obj/projectile/bullet/bolt_slug + +/obj/item/ammo_casing/strilka310/Initialize(mapload) + . = ..() + AddElement(/datum/element/caseless) + +/obj/projectile/bullet/bolt_slug + name = "machined slug" + icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' + icon_state = "yellowtrac" + damage = 50 + armour_penetration = 20 + wound_bonus = -45 + wound_falloff_tile = 0 + +/obj/item/ammo_casing/bolt_slug/scattershot + name = "machined grapeshot" + desc = "A fistful of ferrous roundshot wrapped in a paper sleeve. The sleeve readily burns off from the heat of acceleration, leaving \ + the shot free to spread and brutalize exposed tissue." + icon_state = "machined_grapeshot" + projectile_type = /obj/projectile/bullet/pellet/machined_grapeshot + pellets = 9 + weak_against_armour = TRUE + +/obj/projectile/bullet/pellet/machined_grapeshot + name = "machined grapeshot" + icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' + icon_state = "shortyellowtrac" + damage = 5 + wound_bonus = 5 + exposed_wound_bonus = 5 + speed = 1.1 + wound_falloff_tile = -0.5 //We would very much like this to cause wounds despite the low damage, so the drop off is relatively slow + sharpness = SHARP_EDGED diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index 34434154368ff8..031117b82f1cd6 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -1,12 +1,27 @@ /* -* a tiziran gauss rifle that accelerates steel shot to lethal velocity with the power of electromagnetism. it's for pirates to kill people with. -* mechanically, this isn't that different from a sakhno +* a tiziran bolt action gauss rifle that accelerates steel shot to lethal velocity with the power of electromagnetism. it's for pirates to kill people with. +* mechanically, this isn't that different from a sakhno-zihao if it could also shoot buckshot on the side. in return the magazine is smaller */ /obj/item/gun/ballistic/rifle/bolt_thrower name = "bolt thrower" desc = "Tiziran small arms often feature gauss or rail gun style electromagnetic drivers in an effort to prevent \ - errant sparks from igniting low lying puddles of subterranean gasses. Ironically, since the drivers are easily and \ - frequently tuned hot by the end users, they end up causing ignitions anyway when hypersonic projectiles hit still air." + errant sparks from igniting low lying puddles of subterranean gasses. Since the coils are easily and frequently \ + tuned hot by errant operators, they end up causing ignitions anyway when hypersonic projectiles hit still air." icon = 'modular_doppler/modular_weapons/icons/obj/guns48x.dmi' icon_state = "bolt_thrower" + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bolt_thrower + fire_sound = 'modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg' + weapon_weight = WEAPON_HEAVY + need_bolt_lock_to_interact = TRUE + +/obj/item/gun/ballistic/rifle/bolt_thrower/Initialize(mapload) + . = ..() + AddComponent(/datum/component/scope, range_modifier = 1.5) + +/obj/item/ammo_box/magazine/internal/bolt_thrower + name = "bolt thrower internal magazine" + ammo_type = /obj/item/ammo_casing/bolt_slug + caliber = CALIBER_BOLT_THROWER + max_ammo = 3 diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index d1ed85f6961158..5ca25a45a4cc38 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -16,6 +16,8 @@ var/power_draw_per_shot = 2000 WATTS /// what comes out of our barrel var/projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt + /// how long between shots? + var/shot_cooldown = 90 SECONDS /// can we shoot or are we on cooldown? var/ready_to_fire = TRUE /// our id to link with our firing computer @@ -43,7 +45,7 @@ var/datum/weakref/snub_particle_cannon /// mapping id for our attached gun var/mapping_id - /// tells us if the cannon is working/present + /// tells us if the cannon is ready to fire var/cannon_info /obj/machinery/computer/snub_particle_cannon_controller/post_machine_initialize() diff --git a/modular_doppler/modular_weapons/icons/obj/casings.dmi b/modular_doppler/modular_weapons/icons/obj/casings.dmi index cefc95600628bffba7a392b4fcfb6500e6862548..818b8b002c9ae3c7568c8fb7fc37f752cc0fdf6a 100644 GIT binary patch literal 2588 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 delta 1238 zcmV;{1S$KP5BUm^Bmtd~C6j+#$_lQ2F5n;m03m)+0bu2MhyVZtmq|oHRCt{2oH1w= zK@^5}C8;g6iWVuXETXA|DC827LIe>da3X3N8?CGqu@uot5VVepcpwoQu?UzeG-wqQ z>_iB`q)`iPMb7*yFH9~`v-9@m-?uj(gjp_d@9q5aX5Y-dxwP4ACcb|R4-dD}HN3xI z4UK(pZt7X<;pEA6A8NIl>igRHpMQIo&a^)FKlZl2!^f$zfX+X1dMIld_R;yf4;;=~ z-|sLj06PETp}wqTfX?69H=4D+m=>T4m=*w|-)%#K(eJiCm=>T4m=@svyVVVCXuhw$ z+R*x7T7W8`65#Epg`$7_=vra~kTEI1`1p8lRqUG-U}k3KXI1Q*6kudzB-?v={bVk2 z+p)2+o{;vxF1$(H*2lg{0bJY^^w%1p?Yk+ckA0H@%+Ahkx%u_C&&zDzqySYS3P2_b zKqd-6CJI1CCBTRI<)ZxPT4Dr{F)hII)ZNr=L$hykC3RaLObdTd1$unzXteb_kw3%; zAY)zt*$HJKJE6Xq7l26-)39j)s_+~#Er4KIh)M`xnJ7R3Xd*CWpAYDEVg!(h0+5LU zkcqXSWP%hjb%I?3^$jH;-xeD|lYvuLp0@@E4<_^T?~~@shPQo_QxH1;^0ixu{MC-u zHwn^d`_lPn;u?;+IW=N_YuL|6oi|{ zsJr*zMb_~E*8rbS2k>Dl`w|IxF&6<6`rG}y?5HAuQ57NcE~Wq(`51{4^|L|!fKAuF zT<67H1WeyPk>0s^bv^9yH@CQw{Vzl&1RJmq!DZTkecyjfNVOOA@yn0ag^A;oy&!fP zDi33s`YD}0GTKNnJ9k%nJ54m@3NGt6h^V}iU7HJw?;p7 zeLh;ZM&Ih9EVlr7A%PA@L8{c}ORao}PLRVHsL7Ytfv_L?kVaAD7C=Uw)W=I@aOg6@ zcKg2d`D}6v;2z7_&gYSTlUo41ghqL`j64~MArDB%u_V{NRdQ!RQV5Hhcp35N1kFjo zy!L;aNzxMAXytH5=uE5#yd7qzp+y}NHMz7EuXMmh7V}e)yoy zf{JoPLs|UrA!b2jq5x!~0A!*7WTF6Mq5x!m17d?vi6oE|UjP6A07*qoM6N<$f}$-z A5C8xG diff --git a/tgstation.dme b/tgstation.dme index 30850930b41bc3..2383a13ddbcf37 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7553,6 +7553,7 @@ #include "modular_doppler\modular_weapons\code\melee.dm" #include "modular_doppler\modular_weapons\code\weapon_overrides.dm" #include "modular_doppler\modular_weapons\code\ammo\bandolier.dm" +#include "modular_doppler\modular_weapons\code\ammo\bolt_shot.dm" #include "modular_doppler\modular_weapons\code\ammo\calistan_4mm.dm" #include "modular_doppler\modular_weapons\code\ammo\detective_holster.dm" #include "modular_doppler\modular_weapons\code\ammo\europa_25.dm" From 784bac879852542aad8ff6cad7bca918ef270f68 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 24 Nov 2025 00:25:01 -0800 Subject: [PATCH 04/38] hold all this code rq --- .../modular_sounds/attributions.txt | 1 + .../sound/items/particle_cannon.ogg | Bin 0 -> 39389 bytes .../modular_weapons/code/ammo/bolt_shot.dm | 2 +- .../modular_weapons/code/guns/naval_gun.dm | 70 ++------------- .../modular_weapons/icons/obj/guns32x.dmi | Bin 4532 -> 4763 bytes .../modular_doppler_tsx/SnubProtonCannon.tsx | 85 ------------------ 6 files changed, 10 insertions(+), 148 deletions(-) create mode 100644 modular_doppler/modular_sounds/attributions.txt create mode 100644 modular_doppler/modular_sounds/sound/items/particle_cannon.ogg delete mode 100644 tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx diff --git a/modular_doppler/modular_sounds/attributions.txt b/modular_doppler/modular_sounds/attributions.txt new file mode 100644 index 00000000000000..1e35702e8f7c4c --- /dev/null +++ b/modular_doppler/modular_sounds/attributions.txt @@ -0,0 +1 @@ +bolt_thrower.ogg - lentikula, "Sci-Fi Weapon Shots SFX", CC0 license diff --git a/modular_doppler/modular_sounds/sound/items/particle_cannon.ogg b/modular_doppler/modular_sounds/sound/items/particle_cannon.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a1e833adf2bbe0bbfbfd48b48cfe2663ec19dedd GIT binary patch literal 39389 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 M%<+GA3;oaWZ)5FALI3~& literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm index 0201ed9fb1b899..295bc13bd9c7c2 100644 --- a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm +++ b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm @@ -5,7 +5,7 @@ /obj/item/ammo_casing/bolt_slug name = "machined slug" desc = "A solid lathe turned slug of ferrous alloy, ready to be shunted through a hot coil wrap and deep into something or \ - someone unfortunate."" + someone unfortunate." icon = 'modular_doppler/modular_weapons/icons/obj/casings.dmi' icon_state = "machined_bolt" caliber = CALIBER_BOLT_THROWER diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index 5ca25a45a4cc38..e95d174d69ece1 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -4,78 +4,24 @@ * and has a moderate cooldown. */ -/obj/machinery/snub_particle_cannon - name = "snub nose proton cannon" +/obj/machinery/deployable_turret/snub_particle_cannon + name = "snub nose particle cannon" desc = "A weaponized particle accelerator that fires balls of hyper-energized protons. Originally built to fit ships much \ larger than this, this one has had most of its barrel and much of its cooling systems removed." icon = 'modular_doppler/modular_weapons/icons/obj/guns32x.dmi' icon_state = "snub_nose_ppc" density = TRUE - circuit = null + projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt + firesound = 'modular_doppler/modular_sounds/sound/items/particle_cannon.ogg' + always_anchored = TRUE + cooldown_duration = 10 SECONDS /// how much energy we take out of the grid when we fire a shot. uses WATTS var/power_draw_per_shot = 2000 WATTS - /// what comes out of our barrel - var/projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt - /// how long between shots? - var/shot_cooldown = 90 SECONDS - /// can we shoot or are we on cooldown? - var/ready_to_fire = TRUE - /// our id to link with our firing computer - var/mapping_id -/obj/machinery/snub_particle_cannon/wrench_act(mob/living/user, obj/item/tool) - . = ..() - return FALSE - -/obj/machinery/snub_particle_cannon/proc/fire() - var/obj/projectile/fired_bolt = new projectile_type(get_turf(src)) +/obj/machinery/deployable_turret/snub_particle_cannon/proc/fire() use_energy(power_draw_per_shot) /obj/projectile/energy/snub_particle_cannon_bolt - name = "energized proton bolt" + name = "energized particle bolt" icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' icon_state = "ppc_bolt" - -/obj/machinery/computer/snub_particle_cannon_controller - name = "fire control system" - desc = "The computerized control system for the ship's mounted proton cannon." - icon_screen = "syndishuttle" - icon_keyboard = "tcboss" - /// weakref for our attached gun - var/datum/weakref/snub_particle_cannon - /// mapping id for our attached gun - var/mapping_id - /// tells us if the cannon is ready to fire - var/cannon_info - -/obj/machinery/computer/snub_particle_cannon_controller/post_machine_initialize() - . = ..() - if(!mapping_id) - return - for(var/obj/machinery/snub_particle_cannon/cannon as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/snub_particle_cannon)) - if(cannon.mapping_id != mapping_id) - continue - register_machine(cannon) - break - -/obj/machinery/computer/snub_particle_cannon_controlle/ui_state(mob/user) - return GLOB.physical_state - -/obj/machinery/computer/snub_particle_cannon_controlle/ui_interact(mob/user, datum/tgui/ui) - . = ..() - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "SnubProtonCannon", name) - ui.open() - -/obj/machinery/computer/bsa_control/ui_data() - var/obj/machinery/snub_particle_cannon/cannon = snub_particle_cannon?.resolve() - var/list/data = list() - data["ready"] = cannon ? cannon.ready_to_fire : FALSE - data["cannoninfo"] = cannon_info - return data - -/obj/machinery/computer/snub_particle_cannon_controller/proc/register_machine(/obj/machinery/snub_particle_cannon/cannon) - PRIVATE_PROC(TRUE) - - snub_particle_cannon = WEAKREF(cannon) diff --git a/modular_doppler/modular_weapons/icons/obj/guns32x.dmi b/modular_doppler/modular_weapons/icons/obj/guns32x.dmi index 08766d3281773219dfd16e57087c4cfa0134f9bb..9cae2f958dedbd4616ce09afe0595a556ade8f5a 100644 GIT binary patch literal 4763 zcma)=S5OlUlfXj}5Qq`wPk=}l>7W7$3WN?eAoO0O_ke)(CPe{hN)b`2B1i`z(wnp( zy#x%QH-!KRH3Z1{-NVf{-`&GK?C$K&&c5t#XLmLpp`!(4tz5QH~UI0Mghm47uD_y)-=@uImE{)+Pf3btXMR%^8 zGR9=Sy~ZTt?RI(u#pkO5t8s!0y8T?@znA>l<~9kzd{W-lW@^XZEZ1&^h(!&JdN96` z&3A}4SV>uZFrci}L{*oV&l%iiAFL6YI!cRi2Ybmr>X;bhTiKvF7Ns zLKg8&Sl)WtFuYGvCJ0qOKESHm+&bm&jNYjR5$OXS(SMQqS`wsNTPsmJJq=>mJ!;+Cg$shx7}lD{qbQ7yS6v+DaL?aL&7T{2{10V0Uho zOzB)3{uttvEA5=Sac?9jTUzgC%vDtezJFJCuQ<54Jd<9({*gygxb>qRW{K${?PZVH z(;0>1)@%+epI|B!vJSVPnUaGo_Btc-oj+_qJ@h*t1MdXylrCsUkC6%CxqBysmC}R9 znd0%9nKr4v`s}|(GQAohERn~iERYY5s+vN@=OerqE(}kPE)4Gv9vt|stYWM#G}a6x z(IOW+s>N#+CROokEf>q#W7i{2S#O6pM{ZJ z$ukG8fGk|w4O#7^w=)C8DxM#gp3u$6ux)n(L!V-gdIzeS&j$Nnj;pDVa7>jmC*y@e z5y4?h=sZE5^DYGVUhFpPz zg+hJ~(+HAd#b(_`FWbo%#p_&C3SN>5kyWRH->DFv_=%xJWXs0<%-eCSsh~rrb1YB4 zJ(kAg4bnZbX|>35OPta|9zmp%Zk7Zg5{=U=jN7En_-;qyuU7@E3czSz>?IDv6@!m$ zczVFyUxBJ>FoiPTQL8@fY#mW ze-T0!RB|!$#o72y&*(}aP@yO?%fSQ_MxuR(SY^@npX2o()Arx4-E9WAg9j#J*NKY% z!d?r}|27Ty zu9+0(ncQsmjBO`43s(t|Qb+xuv(1{ig?PRlU?Ln{piCh3vbOOHo5P)X17m^T3Dd}) z1=GQgWYe+(yWbvsO@d}Oz-V|_sA&DcH;}O8JUA8pI@93(&6fmkYv>h)CkutzKbop1#=ZmH&(sRYc*m%_ochJepxP(r z$HDNHYE-&4^L>#Xzg8uiHag1`BoH7aX#h%b;pdW#Gz#Bp#JlwvleVmTEnay&XywWO ziDkwoVpq>K3?5Da0{QOFGja!)N{56_#)_yXc_;Krz!s*v7R_-amLb8Dgik78ag(0D9|5tndC&n(xsPu%GgN5B3nfIDczd&wOHipg6Eu7ZUIR%VvH3%E1c5BPx)pt<_L14F<4oox|~M{!%` zCdgJkQma?!W2e*B>r$FhyEAO9)t({vqOC%?yMXTQ6vg?%LW6?Ks0uyW3-ja*+lOCx{0qSR zI8y@R`Y~jwbxYTZounw-lkd^XwkI}jW2I>o-viIo}%P~)K{F_OE^a4vqX-D^djrj~Glav%MvRz*O^Ys#TZGU?7fi7Y*NX~{ zqKp28RKo1L?I;(?uT;!lDcYG?PMa$^oP7W4&h4^2pH2Nw zAr*g0YS?c$0ImepG=7vU;LIoW14M1LLNw}1TbG~@k``~-Zh&h#+d_8L@y9i#C3G(A zURd>&%Q(H}4Fr()kGcWhzv0sf?MT=kc9)Q+oUI<$2xu)McjPYy;tfv)ACC}=SK2_y z-1vtfG$izCyU8>4h>~XDCjL?(F=A;s@h{!*vtjx87tJ5!2oKNj+|DlkMIQ{$>W0nV zzulR9P|2*qTA=o@*SN|{WuVHk?v`;N0I7Rv#6USGxt^MNd1zo@M(&754q<-BHFf&r zB4kOnROU zL1E`m>aw$)^UG7_)9-we0Sl-d6fY%fi77%+^++|#D3L4Zyw|4a07RM8^}jih=^&z4O6!6-z<4!}&+q<6~y6I#h+()r!BIrqCj zLfgJW;mqDa`6WQB66Gb|B0Fm7#{G66*5$j|+M>LW`#r31?6bzCNrl+`&jH7Jndeum zzTi^aSNz9s|JoQq55EwSyXvI)aCT2<%hIu9s1Nvwg}1Gbp7F}s%dVAZ&+Qe8F=;SR z4!b@;UOYRZ>F$NK5=%Mx6fLL*j#IY)>j6rp1{J zYTV%C!#%xnhj#D}(YMvz7+!awRx}F?(qbUH?;dcgofXFyQ9Z+ejp8YGLhQo~z9kz2O*g@x- zJEs83J0x(3sB%PFi~8YebD&IDh(52QH>ziLeu@U|&0(PA6Ub$$e=U z{XSmBmWV!v04%RutyLU%puXXS+EV9a{6URLwoJs0NFiY2H4hp?yd;xsTf!n_ zwWinQGR}4f#b+8^E!uv|yOdL^E|D$4qfesNd!i1H$RxcY=z*0cjnABQ{N_hszw(@& zCS>A&02Vns!MUGb--%(J$i;$F$mt88e`@=?S9&Gc&X_en_hgcEJg;>eBOcMCy_9B9 zcE876+@PKxgCx|x(lKyQt?Z>z$0>aK2r_)0P+LV;%Gv%L(z|vqa&(5S3mp7RK0t&C z)>?%Fm<0{zXVF+AHnX#{1IY;adHUP5lq_?N|xX5t+T z^?P@oU;Xl$xIg1n9T$Ce(!>)M?GLYQifYUwE_3I|Ikk&qH&EqIvR_Tiv+{Pkx2=W+ z)R|{<_Ysw_OzDJCy*C(sR)1#1CV@b3v9sepb#S}E*H+=I$v^}8X{-yhnVxK@k-w7l;Z9sj6k2>2+1*u0=Y6ub)_DZD=q{usTC$l!XlSPY&v~ z0dIIVw5s9t+*$MW3-oJRm`1_i8&`k_({H-xSAIC0ozT3kW3U`S{1pHp+wdagsH$RlR}epgRKI3 z1%3VzJ3xd=P4kJqkk{$17Tz+mUH-dnwnu29EorKO(!#P$n}6@~jf(0rsY$FJ>y0f7 zn-Ye~XUj7!Jr#3~dI@j{PIpbHk|nZSP%pAhJYkydy&&ppg47dPOrOg z&gpaE8bcLXm^h(N)ojIpfh~M~&@Hj`y(z=UZ=9Wm_uM=;6p`f&ZvE^fFDZ*Bkpc$}5fK?{N~6bJCL`xL|Op(fF# zODN$XzrvX9r9-#LwhF&}k_QWlZMXN}_aEau-Ugq_b5-NwQlSTE!%sE{(C&!d%7-Y>XntwVAsVMK?_aEcK@$#sUmpQhz80S_TLFe!*Kw{a$U= zz?{%<$*7)`Hzb0#L71dT@;i|I2^<3bKG5fZJ`3<5MmsrqPc;|LDZZ80ycgN1!ID8; zdvNc4O}LjS?+ua402#;Ys`D?s!DU^%@9zb#`wQS2=vPJn01%W(L_t(|ob8=!s2$Z6 z$0tUVl3L#ht$$j|HNmK@7)nT!U`RnDQS!x7klLzfp;hrip+Z|Jt&~1Mp&yD$K?_1D ze$g+%q&~oK(;jX2c_Te>YVx_{=_h`h982CwxATH0PoB&j zziQR0WX*-2&TZp4O~4JL*Ld%p-^xPTAW553}lLrHXOwam@&riPc<<+@uPrdkYx(wxisR3;J z{G}@%eB{v%Zhqa`b?LTGtv)-s|L4ETj``{L?@eC$)62=k=hkM&Sg`Hr%+W>)aA@kl z3S{G5+%cdf7)>pdL) zLjhp@F^cw;(S2|$tYUe~$A5U<7xwOsUZZH=u*+{d|EtIcP}(1&rL1x4~Hff74vww@BpFWm*4?Fk*dfG$-n8Ids9zJ zZ)25^8DA8BAdOuQ+(^DH0osy}d~GxT%bq_&L8g+dTmSkXy%`p55E^^fz(g@m;Pi1N=|I3~~WU~@%)7uM~{4S6WrxTKo?ML1^-hWm6 zx&L`@zcG6Mg$D4|Emw6Y+(OTnX85sVrNvv*qBkVpdft%yP(`n4=z$g>U#V%l ztH^Is*{&+TN&bgI9}?YRh5tFV{{PGgc>j2IOqI-UO55_S^4X%?di~`rzwP`Vl>A@` zK;aN;#rz{(oj*8-*)~FQhu-*l-6ed59;QJLB5Y&duc%#Mfq*# z{~+Z@`vJW54Vt#)d+$4L^4re;LCKF=)k5>vf;A4(3$!iYH$Q?wdf~R^x1IlO%NLU& z2N{zv2MT{e3kRT`?xo^u&pw$=uXp#R&*b(!GWCya8`i<^uD`jj z_e}X#Hf7m#Ewy}~2Bu?K-9Ntq((Clryhh`M2(iRuRzgL!ld)oMn$T>&)}!0=fS(-I zt}lm@KrAoPsS)k`^MI2wL20c4aE==L*&IJ(auI)izRO z;m7{~3XUH?T3|mZ#Pzx*h7e25q7Ve1^@I}h!*2K>oHYup+d0}feIGwtV-+9g6MiwJ z>0E#LLM#P~rbqWmOobw&diS|dAf*?>PEIks_vgpgfcN;;0Px{5weW~h zWKjuVmEU@9J6o|;{o*7c`l1TuTiKLl)3wy{eHxgK<$nJ^+D-MK6K zziHc!!sDkVpG#iYyE}Py_ny{!*F|+?0EP!2d9*`Cr$Q61Tce2V>&OU32N{6DD||?i zyMNn)=T1yaq#tmQ5sVgNZvdB0tnaM3aCLI*y?2wNhmT|)9_w|Oot=fk%Lqn{u{Qv) zcI`xJ0Kk?4HY5TFi|)Jou0=}iLnlJx0=T|ie`EHDjAIBG`&J+-C6?>1T%USx{IG6~ z0r>x+?OaC*^1+86WZV7vt+(9X*|KR{Cx00+kY*TmTk;_rY2dHdw5S9y*surdFaqn* zi?GL8gJ8+x*JoyCbN@#PYs_uPrqk+2T51==_*x&n#K%-G61N z(n9$W@7o`?;rOkazm%Rs4~6r%wCi9L!=L3yZ3DpfSNrAthY5OrR$Qt4Scf-1a`g4I zWbpL>_7}kGA2{^KTxetK7j_+tYWTC8Uiu8s01+h7Mmh3&Cn+_G(wCHG62K8 z!l$82mFBgky~bjAkO4T#VskrOLM6cHBLirF?d=t#P3sl6VX6d=0(N{6E9?iSCR=}w zql!v^5yRI_)Su8Bt$PlY0HRGa6he$OG5|5w$Ng+(Tu-hHK~!OplB~b%vJRB|>J1xGg$MBVRPZtdw8ybj zfI+-6J)IiIk=I|Zt(Y`OYkz$Iz395!F)QDGK3j)uq@!0OKwe-OGkVarp%s;gEQO2m zTqS@358QiiDnAt;N*(d=sli~sH5eL!DH%F-jKC_tRr>Gz;1{{$e)+S7^;2DAn1A@S zN*x+MiQT6S|4`zzWdz6@>yVh&gz4|zQ)VPhozQY6X8?ToTzcid{C|qIS*Z|%p%S1G z*wCrSn|eaZ55=FJekIv*)kVp}Pdt-uyXUqWlj)r|CmS|g-8F>orN^GAX$0Q*Arqxm z8OWP9jDX6|JO*|h*t}+G(8LKXXQDm9%slJ)>%imjQ2c|b1C@XKyn+KLJd__x!1aT# zzMUD!zP(9m1XX}Cd4B^%2pGbKg}lE(8-Z1R|9oPlmNjPFBd*bQ_%;kIG62T^po#~K zVZ(%8uSeyFVgq>p5Zq5g+5cF%0fZ|2)^mnRJeG2}N2`c~FoKx!Gfh6d_P%(Zrj$l# zG}cCt8303oUX;EH^Oft$MKB)P{>Sc2l5akqDK-=y<=4vg|T;pLRR$jrSQVDaMUxN0{{_b;F;cYt;b{9}kd5 zfcPFiC^(cK3XdPwv5ot!^4Iamw$4-b!}aYChK(h?@?43K?@PgYQL9btczaDN%l@jQ z8TaPi5@$3gvs4eSZZv+ioiFRUS5u$9;q$&~;$WLc_Kf-03TTk*4Ai=he?o1qqe z*yhJC0ai%M!WUR!_w z+sv!rdpLdQ#fKkK0_zoRuk}JZ{bD1ilCHW+V|%XIW6jPwc=%9QgKgNy=3V^Q-;wrg z*NoSzq**OO1$BU?nG>sgRUy>LV~x=gd%)aoL$G{jRe4F^X&NuHi55z2`z?y_$FuHG z7k|b0)yND0F|uvKv(zz$m}1&%hvM;&@_Xt$R9|xSY6N0=k}CmXM!+~crhqXIZN~%E z9ikj6L7K*|y@qjR4j|UIfq34AG>q$u@W+Sh4Ukpl3>4l}V^IiXjQ~LD7*1fFnQwpG z=Eu<3N@!i>??+|L8cxgzsv1X;!ud)t)_?ha0*7r-vC#^&GB8LF+py1uKscBC{Pm0S zr)o*rkNVxH6Kn>Z8-Fs_L}xP->riIzUAPTPd%W!(t)l#)p5uPthjqkclrqv>ysk1sX@J#Ri)1mZQL^m1M5i^3aQY`dBiiz>F_`b{`#Exejf$6C7(o!hRQvSu1hCo*N8OO%n z$)!Qqp}bYW8)A0$f~5k=V}F&9ic2G5C6TXj#$GYB9=NEVqptB6lnyCHuS6E57x(Rt zQyrk<`v7dZE9;iGAyKILt_mnMyoc-6Yw>!a$|t?9A8|>%V#QvH@5ekuRbYwW!=j>h zfr)?dUoXX1FaTRIgHof3&U<`2ZiP*KvDS{N;M~ysLRIj}iF3;)w}0}}qEvl1dXUOb zyb*w+DN%r%7DaOd%~P5Q)hDJ}Xya~D2?kU`+msoqycIQphLqo5GxqTP#8|N~$ks0g zt^Ag%6JuFp_7h```^<2a9$aV=rlP3{n|=jWgSLj05uuZ^dIEIIz9VxW84kk|8lL|6dY3&MgRZ+07*qoM6N<$f(<0&g8%>k diff --git a/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx b/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx deleted file mode 100644 index 41c0a6efec7328..00000000000000 --- a/tgui/packages/tgui/modular_doppler_tsx/SnubProtonCannon.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import { - Box, - Button, - LabeledList, - NoticeBox, - Section, -} from 'tgui-core/components'; -import type { BooleanLike } from 'tgui-core/react'; - -import { useBackend } from '../backend'; -import { Window } from '../layouts'; - -type Data = { - ready: BooleanLike; - cannoninfo: string; -}; - -export const SnubProtonCannon = (props) => { - const { act, data } = useBackend(); - const { notice, connected } = data; - - return ( - - - {!!notice && {notice}} - {connected ? ( - <> -
act('recalibrate')} - /> - } - > - - {target || 'No Target Set'} - -
-
- {unlocked ? ( - -
- - ) : ( -
- - -
- )} - - - ); -}; From bc86c268507e1ee780fe1b3fba36f120a8001658 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 24 Nov 2025 23:03:29 -0800 Subject: [PATCH 05/38] prelims on the ships --- .../~doppler_defines/shuttle_defines.dm | 1 + .../pirates/ship_names.json | 9 ++++ .../pirates/tiziran_raiders.dm | 41 +++++++++++++++++++ .../modular_weapons/code/guns/naval_gun.dm | 15 ++++++- .../code/shuttle_templates/antag_ships.dm | 21 ++++++++++ .../species_clothes/code/tiziria/armor.dm | 2 + tgstation.dme | 2 + 7 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 modular_doppler/modular_antagonists/pirates/ship_names.json create mode 100644 modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm create mode 100644 modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm diff --git a/code/__DEFINES/~doppler_defines/shuttle_defines.dm b/code/__DEFINES/~doppler_defines/shuttle_defines.dm index c5384708ef0bb4..fa1742a2d6500d 100644 --- a/code/__DEFINES/~doppler_defines/shuttle_defines.dm +++ b/code/__DEFINES/~doppler_defines/shuttle_defines.dm @@ -10,3 +10,4 @@ #define PERSONAL_SHIP_TYPE_MINING "Supply" #define PERSONAL_SHIP_TYPE_DIY "Incomplete" #define PERSONAL_SHIP_TYPE_POD "Pod" +#define PERSONAL_SHIP_TYPE_ANTAGONIST "Antagonist" diff --git a/modular_doppler/modular_antagonists/pirates/ship_names.json b/modular_doppler/modular_antagonists/pirates/ship_names.json new file mode 100644 index 00000000000000..6a320ed749b4d0 --- /dev/null +++ b/modular_doppler/modular_antagonists/pirates/ship_names.json @@ -0,0 +1,9 @@ +{ + "tiziran_ships": [ + "Blade Held Firm", + "Dead World Wrath", + "Scale-breaker", + "Bite The Hand That Feeds Poison", + "" + ] +} diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm new file mode 100644 index 00000000000000..b4f330c79e2f40 --- /dev/null +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -0,0 +1,41 @@ +/datum/pirate_gang/tiziran + name = "Tiziran Raiders" + is_heavy_threat = TRUE + ship_template_id = "kaz'akran" +// ship_name_pool = "" + + threat_title = "Submit or Die!" + threat_content = "Your warriors are weak and your masters are far from here. Surrender %PAYOFF credits to %SHIPNAME, or we will take what is ours!" + arrival_announcement = "Your warriors are weak and your masters are far from here. Surrender or suffer!" + possible_answers = list("We accept your gracious parlay.","Stick your head in a nacelle!") + + response_received = "We have taken what is ours!" + response_too_late = "We wait no longer! Perish!" + response_not_enough = "This is an insult. Perish!" + +/datum/outfit/pirate/tiziran + name = "Tiziran Raider" + id = /obj/item/card/id/advanced + id_trim = /datum/id_trim/pirate + uniform = /obj/item/clothing/under/lizard_kilt + suit = /obj/item/clothing/suit/armor/lizard + back = /obj/item/storage/backpack/lizard + glasses = /obj/item/clothing/glasses/lizard_hud + gloves = /obj/item/clothing/gloves/lizard_gloves + head = /obj/item/clothing/head/helmet/lizard + shoes = /obj/item/clothing/shoes/lizard_shins + belt = /obj/item/storage/belt/lizard_sabre + +/*/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran + name = "\improper " + desc = "" + you_are_text = "" + flavour_text = "" + prompt_name = "" + outfit = /datum/outfit/pirate/tiziran + rank = "" + +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain + rank = "" + outfit = +*/ diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index e95d174d69ece1..45fad15f89ede2 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -12,16 +12,29 @@ icon_state = "snub_nose_ppc" density = TRUE projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt + number_of_shots = 1 + cooldown_duration = 5 SECONDS firesound = 'modular_doppler/modular_sounds/sound/items/particle_cannon.ogg' always_anchored = TRUE cooldown_duration = 10 SECONDS /// how much energy we take out of the grid when we fire a shot. uses WATTS var/power_draw_per_shot = 2000 WATTS -/obj/machinery/deployable_turret/snub_particle_cannon/proc/fire() +/obj/machinery/deployable_turret/snub_particle_cannon/proc/fire_helper(mob/user) + . = ..() use_energy(power_draw_per_shot) +//we don't want it to spin like the parent turret can, so we override this behavior. +/obj/machinery/deployable_turret/snub_particle_cannon/direction_track(mob/user, atom/targeted) + return + /obj/projectile/energy/snub_particle_cannon_bolt name = "energized particle bolt" icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' icon_state = "ppc_bolt" + damage = 50 + +/obj/projectile/energy/snub_particle_cannon_bolt/on_hit(atom/target, blocked, pierce_hit) + . = ..() + explosion(target, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 3, explosion_cause = src) //small concentrated explosion makes tiny breaches for ingress + return BULLET_ACT_HIT diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm new file mode 100644 index 00000000000000..5cebfd03010e89 --- /dev/null +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -0,0 +1,21 @@ +/datum/map_template/shuttle/personal_buyable/antagonist + personal_shuttle_type = PERSONAL_SHIP_TYPE_ANTAGONIST + port_id = "REDACTED" + +/datum/map_template/shuttle/personal_buyable/antagonist/tiziran_corvette + name = "ITS Kaz'akran" + description = "A Tiziran warship built for high speed pursuits of lightly armed merchant farers." + credit_cost = CARGO_CRATE_VALUE * 18 + suffix = "kaz'akran" + width = + height = + personal_shuttle_size = PERSONAL_SHIP_LARGE + +/datum/map_template/shuttle/personal_buyable/antagonist/tiziran_intercepter + name = "ITF Zul'kath" + description = "A Tiziran warship built for high speed pursuits of lightly armed merchant farers." + credit_cost = CARGO_CRATE_VALUE * 18 + suffix = "zul'kath" + width = + height = + personal_shuttle_size = PERSONAL_SHIP_SMALL diff --git a/modular_doppler/species_clothes/code/tiziria/armor.dm b/modular_doppler/species_clothes/code/tiziria/armor.dm index 96ff919700879d..ce10e08881bc0e 100644 --- a/modular_doppler/species_clothes/code/tiziria/armor.dm +++ b/modular_doppler/species_clothes/code/tiziria/armor.dm @@ -105,3 +105,5 @@ inhand_icon_state = null body_parts_covered = HANDS|ARMS armor_type = /datum/armor/colonist_armor + +// EVA suit for the pirates diff --git a/tgstation.dme b/tgstation.dme index 2383a13ddbcf37..c213c928c0701e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7127,6 +7127,7 @@ #include "modular_doppler\modular_antagonists\cantina\spawners.dm" #include "modular_doppler\modular_antagonists\changeling\changeling.dm" #include "modular_doppler\modular_antagonists\datums\antag_recipes.dm" +#include "modular_doppler\modular_antagonists\pirates\tiziran_raiders.dm" #include "modular_doppler\modular_cargo\doppler_cargo_packs.dm" #include "modular_doppler\modular_cosmetics\toggle_clothes.dm" #include "modular_doppler\modular_cosmetics\code\clothing_overrides.dm" @@ -7657,6 +7658,7 @@ #include "modular_doppler\ships_r_us\code\micro_reactor.dm" #include "modular_doppler\ships_r_us\code\order_console.dm" #include "modular_doppler\ships_r_us\code\shuttle_parts.dm" +#include "modular_doppler\ships_r_us\code\shuttle_templates\antag_ships.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\big_boy.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\ferries.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\incomplete.dm" From 394fb04b2fc4cc7abd96b4ee75fd4a7c63a85bd2 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 25 Nov 2025 01:35:32 -0800 Subject: [PATCH 06/38] more mapping, hardsuits --- .../~doppler_shuttles/tiziran_interceptor.dmm | 274 ++++++++++++++++++ .../tiziran_raider_shuttle.dmm | 65 ++++- .../modular_cosmetics/code/suits/hardsuits.dm | 2 + .../icons/mob/head/helmet.dmi | Bin 0 -> 1406 bytes .../icons/mob/suit/spacesuit.dmi | Bin 0 -> 2562 bytes .../icons/mob/suit/spacesuit_digi.dmi | Bin 44070 -> 39673 bytes .../code/shuttle_templates/antag_ships.dm | 21 +- tgstation.dme | 1 + 8 files changed, 352 insertions(+), 11 deletions(-) create mode 100644 _maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm create mode 100644 modular_doppler/modular_cosmetics/code/suits/hardsuits.dm create mode 100644 modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi create mode 100644 modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm new file mode 100644 index 00000000000000..71879d6e4759f6 --- /dev/null +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -0,0 +1,274 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/space/basic, +/area/space) +"e" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"h" = ( +/turf/open/floor/engine/hull/reinforced, +/area/space) +"i" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) +"l" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"o" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"s" = ( +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"z" = ( +/turf/open/floor/plating, +/area/space) +"B" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) +"I" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/plating, +/area/space) +"K" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space) +"S" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/space) +"T" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/marker_beacon/burgundy{ + pixel_x = 16; + pixel_y = -7 + }, +/obj/structure/marker_beacon/burgundy{ + pixel_x = 16; + pixel_y = 5 + }, +/turf/open/space/basic, +/area/space) +"V" = ( +/obj/machinery/computer/shuttle/pirate{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +h +h +a +a +a +a +h +h +"} +(3,1,1) = {" +a +a +a +a +a +h +h +K +K +K +K +h +h +"} +(4,1,1) = {" +a +a +a +a +a +h +h +o +o +o +o +h +h +"} +(5,1,1) = {" +a +a +a +a +a +h +h +o +z +z +I +h +h +"} +(6,1,1) = {" +a +a +a +a +a +h +h +o +I +o +o +h +h +"} +(7,1,1) = {" +a +a +a +a +a +l +h +o +z +e +S +h +a +"} +(8,1,1) = {" +a +a +a +a +a +T +a +o +z +B +o +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +S +z +e +S +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +S +V +i +S +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +s +S +S +s +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +h +h +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index 6fcc35ad0bdc0c..90d775228d4271 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -236,6 +236,43 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark/textured, /area/space) +"yW" = ( +/obj/structure/shelf, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/lighter/skull{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/space) +"zh" = ( +/obj/machinery/deployable_turret/snub_particle_cannon{ + pixel_y = -5 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) "zk" = ( /obj/effect/turf_decal/tile/red/half{ dir = 1 @@ -388,6 +425,19 @@ }, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/space) +"JM" = ( +/obj/structure/shelf, +/obj/item/gun/ballistic/rifle/bolt_thrower, +/obj/item/gun/ballistic/rifle/bolt_thrower{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/gun/ballistic/rifle/bolt_thrower{ + pixel_y = 10; + pixel_x = -8 + }, +/turf/open/floor/plating, +/area/space) "JW" = ( /obj/structure/railing{ color = "#36373a"; @@ -423,6 +473,11 @@ "Rf" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/space) +"RO" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/shelf, +/turf/open/floor/plating, +/area/space) "Sf" = ( /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, @@ -871,7 +926,7 @@ In gG In bn -pW +zh MZ MZ MZ @@ -1384,7 +1439,7 @@ LG Yq vV vV -vV +RO In In WA @@ -1416,7 +1471,7 @@ LG eY LG LG -LG +JM In LG Em @@ -1446,8 +1501,8 @@ MZ bn In Tu -zX -zX +yW +LG zX In zT diff --git a/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm new file mode 100644 index 00000000000000..6b88c3ebbd4f0b --- /dev/null +++ b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm @@ -0,0 +1,2 @@ + +/obj/item/clothing/head/helmet/space/pirate/tiziran_raider diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0ab464b9ef2a7a24847a931f482a55467a93366e GIT binary patch literal 1406 zcmV-^1%djBP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sU)*1vnVkyz9=y>CACP2i!&v&s2HT1i!-e#F*g;&HpHboz9=UT4m9z8^U3*=J_<|G(F5ub2IIt{{IMcs42O zTCEVL7Ojv=qd8nyRKWe8|JFzzHJdC>D|E(mlzRY7X8EG4in>%w#Az27=luuGz&lqh z_p|NxyH>eR-rrMvR{x==rzfdatFGtT>)g=KKe^7%&ZezEVGh<7YKQMI9t`$Hx{N!`n-NGfy{88u4d<2wcU+FttbkuolrBW%; zr+4A4i5lEu>fY53*Q~tTcZ^Mr7<6sLP%On%Y@b`2i*izKmS?Tk%ryWMWc%K4{AfQg ztCD?muJ85xocENAZt$sBKJY(l1qhG&UcZkOyId~&8CE`h(l@w{|9%{)V>BVQz0_ZL z9=fKktr#KY5atx-T8muEhBffaIo;XFKXT|JzZ8uOSNz`$9QiETGHCI2qw09gemmNX zj2U0T*`>JiZkX?X9z8Sa=C8iZt?hl#pQ~LqJwd@*r%^lnQsq322<Wye!L{^|zL?}7ZxcPFzpNpnl`47}VU)Mmhqx7?K7s0M)K z9ewpse8tvsXtqAF(dQ65{-JLNlQ5n-Kx_cm1n`rj&P~~5!hMIWfMNWwO_nT}TXXFE zD?r-F>I5x4`h?%-y;eQW$4N8`C-^?PFmCuL3ZKD6cYbh9KLBmk+rSHR3s*)&qS@$Y zWI7S-m}lqRD2o^75PJg-000000000000000004k?Kz)GenFI9!+8p%(+8p%(8pt86 z4>0ojo9>x`!%cZR>FM6Z$;=1VP#-{Ar9Qx-zsG&Y#I6sZ7>YHe^#L^6tLxWfADvSl z!1+NCyFP$ogr=lEK*#8)Tk&XLRv%#Bi~Vk_>)iY5?OGpTZ199z+}-W&*s;r>$EpwT z@rJeTaHZlp=3ed38?6tJdjMGD+v~{os*2cZpgusZfk%CS9HjP-CUs`!M`{H|bVeE>&&0O|vP`Tzg`0000000000000000B9}$04kz`Ns!kT*Z=?k M07*qoM6N<$f`;X@R{#J2 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..370953ef3c82ff200daeee2995d379fbf87411ab GIT binary patch literal 2562 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 literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit_digi.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit_digi.dmi index 0a70c95584dec740f3b1a8b002a3eac1190b97c7..dcdb4dd775a94dcd8b434a45260a197845709bda 100644 GIT binary patch literal 39673 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 QLcr(0huSJ-N){pi2Xe(| Date: Fri, 28 Nov 2025 06:36:07 -0800 Subject: [PATCH 07/38] space suits and bolt drivers --- .../icons/mob/suit/spacesuit.dmi | Bin 2562 -> 2445 bytes .../icons/mob/suit/spacesuit_digi.dmi | Bin 39673 -> 39635 bytes .../icons/obj/head/helmet.dmi | Bin 0 -> 964 bytes .../icons/obj/suit/spacesuit.dmi | 0 .../modular_weapons/code/ammo/bolt_shot.dm | 29 ++++++------------ .../modular_weapons/code/guns/bolt_thrower.dm | 27 ++++++++-------- .../modular_weapons/code/guns/naval_gun.dm | 2 +- .../modular_weapons/icons/obj/casings.dmi | Bin 2588 -> 2445 bytes .../modular_weapons/icons/obj/guns32x.dmi | Bin 4763 -> 5331 bytes .../modular_weapons/icons/obj/guns48x.dmi | Bin 3908 -> 3090 bytes 10 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi create mode 100644 modular_doppler/modular_cosmetics/icons/obj/suit/spacesuit.dmi diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi index 370953ef3c82ff200daeee2995d379fbf87411ab..54ef845dd599b41c370f5294241fe12e07cda170 100644 GIT binary patch delta 2291 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 JE!`QC@LyDhh(!PZ diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit_digi.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit_digi.dmi index dcdb4dd775a94dcd8b434a45260a197845709bda..d02d982df154a9ab747612539310caafa67e8408 100644 GIT binary patch delta 12012 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 Y^__Zs!jX52=Ipt9+xVYKUE6p61EhHcj{pDw diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7c376577d99fcf9d091e732faeffb8f47d05af80 GIT binary patch literal 964 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 CagQee literal 4763 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 Date: Fri, 28 Nov 2025 17:02:56 -0800 Subject: [PATCH 08/38] huuuughhuguugh --- .../~doppler_shuttles/tiziran_corvette.dmm | 1609 +++++++++++++++++ .../~doppler_shuttles/tiziran_interceptor.dmm | 342 ++-- .../tiziran_raider_shuttle.dmm | 731 ++++---- code/modules/projectiles/guns/ballistic.dm | 2 +- .../modular_cosmetics/code/head/head.dm | 18 + .../modular_cosmetics/code/suits/hardsuits.dm | 29 +- .../icons/obj/suit/spacesuit.dmi | Bin 0 -> 1300 bytes .../modular_weapons/code/ammo/bolt_shot.dm | 3 + .../modular_weapons/code/guns/bolt_thrower.dm | 2 + .../modular_weapons/icons/obj/guns32x.dmi | Bin 5331 -> 5331 bytes .../code/shuttle_templates/antag_ships.dm | 23 +- 11 files changed, 2249 insertions(+), 510 deletions(-) create mode 100644 _maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm new file mode 100644 index 00000000000000..f766e57bea9ca8 --- /dev/null +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -0,0 +1,1609 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) +"af" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"aN" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/space) +"be" = ( +/obj/machinery/turretid{ + ailock = 1; + desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + icon_state = "control_kill"; + lethal = 1; + name = "Ship Turret Control"; + pixel_x = 30; + pixel_y = 4; + req_access = list("syndicate") + }, +/obj/structure/cable, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/iron/dark/textured, +/area/space) +"cb" = ( +/obj/machinery/deployable_turret/snub_particle_cannon{ + pixel_y = -5 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"dr" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"dC" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/space) +"er" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"eI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"fc" = ( +/obj/item/radio/intercom/syndicate/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"fh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"fO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/space) +"gi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/space) +"gj" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/iron/dark, +/area/space) +"gp" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"gz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"gE" = ( +/obj/structure/shelf, +/obj/item/melee/tizirian_sword{ + pixel_x = -10 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = -3 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = 5 + }, +/turf/open/floor/plating, +/area/space) +"gR" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow + }, +/turf/open/floor/plating, +/area/space) +"hi" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"hq" = ( +/obj/structure/minecart_rail, +/obj/structure/marker_beacon/burgundy{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/structure/marker_beacon/olive{ + pixel_x = -6; + pixel_y = -14 + }, +/turf/template_noop, +/area/space) +"hC" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"hQ" = ( +/obj/machinery/vending/imported/tiziran, +/turf/open/floor/plating, +/area/space) +"ip" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"ju" = ( +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"jW" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"lg" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"lh" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"mZ" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"nl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"nm" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"nw" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"nQ" = ( +/obj/machinery/power/micro_reactor, +/turf/open/floor/iron/dark, +/area/space) +"oo" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran + }, +/turf/open/floor/plating, +/area/space) +"ot" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"oO" = ( +/turf/open/floor/iron/dark, +/area/space) +"pb" = ( +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 + }, +/turf/open/floor/plating, +/area/space) +"qv" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"rl" = ( +/obj/structure/chair/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"rn" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"rF" = ( +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile/personally_bought, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"rH" = ( +/obj/structure/railing/eva_handhold/directional/east, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"rO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) +"sy" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"ua" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/iron/dark/textured, +/area/space) +"uE" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/space) +"uT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"uV" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"uW" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control" + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"vq" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"vS" = ( +/obj/structure/minecart_rail, +/turf/template_noop, +/area/space) +"wi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"wt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"wu" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/iron/dark/textured, +/area/space) +"wP" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red + }, +/turf/open/floor/plating, +/area/space) +"xc" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, +/turf/open/floor/plating, +/area/space) +"xm" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/plating, +/area/space) +"xT" = ( +/turf/template_noop, +/area/space) +"ya" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"yQ" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"zl" = ( +/obj/structure/shelf, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/space) +"zE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) +"zV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/space) +"AC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"AQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"AW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Bf" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Bj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"BI" = ( +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"BV" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"Cd" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) +"Ci" = ( +/obj/structure/fluff/sat_dish, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"CL" = ( +/obj/machinery/porta_turret/syndicate{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"CY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"DA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) +"Ek" = ( +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"En" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/space) +"Fy" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/plating, +/area/space) +"Gt" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) +"Hp" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"HE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"HL" = ( +/obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/dark/smooth_large, +/area/space) +"IA" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"KJ" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space) +"KW" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/space) +"Ln" = ( +/obj/machinery/computer/shuttle/pirate{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured, +/area/space) +"Lo" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"LH" = ( +/turf/open/floor/plating, +/area/space) +"MW" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/space) +"Nk" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Pd" = ( +/obj/structure/shelf, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/lighter/skull{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/space) +"Pk" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/plating, +/area/space) +"Pv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/space) +"PG" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plating, +/area/space) +"Ql" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/space) +"Qu" = ( +/obj/structure/girder/reinforced, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/space) +"QK" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 1; + x_offset = 12; + y_offset = 5; + view_range = 10 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"Re" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/space) +"Rm" = ( +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/space) +"SH" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"Ta" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"Tc" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/space) +"Tf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"To" = ( +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/space) +"TS" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"UY" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"Wd" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) +"WO" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) +"Xu" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/space) +"XB" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/space) +"XY" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, +/turf/open/floor/plating, +/area/space) +"Yf" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space) +"YT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) +"Zt" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 6 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner, +/area/space) + +(1,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +xT +xT +vq +rF +mZ +gp +gp +Gt +xT +xT +xT +Gt +gp +gp +BI +xT +xT +xT +xT +xT +xT +"} +(2,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +xT +Gt +gp +gz +gp +LH +LH +gp +Gt +Gt +Gt +gp +LH +KJ +gp +Gt +xT +xT +xT +xT +xT +"} +(3,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +Gt +gp +gp +jW +gp +nl +nl +Bf +zV +dr +To +LH +LH +LH +KJ +gp +Gt +xT +xT +xT +xT +"} +(4,1,1) = {" +xT +xT +xT +xT +xT +xT +Gt +gp +PG +LH +AW +LH +nl +LH +gp +zE +LH +KJ +LH +LH +LH +LH +KJ +gp +BI +xT +xT +xT +"} +(5,1,1) = {" +xT +xT +xT +xT +xT +Gt +gp +nl +nl +nl +nl +nl +nl +LH +Xu +LH +KJ +KJ +KJ +To +To +LH +LH +KJ +gp +Gt +xT +xT +"} +(6,1,1) = {" +xT +xT +xT +xT +Gt +gp +LH +nl +LH +LH +LH +LH +gp +Gt +Gt +gp +LH +LH +LH +LH +KJ +KJ +LH +LH +KJ +gp +Gt +xT +"} +(7,1,1) = {" +xT +xT +xT +CL +gp +hQ +LH +HE +Bj +LH +LH +gp +Gt +xT +xT +Gt +gp +gp +gp +gp +gp +gp +gp +gp +gp +gp +gp +Gt +"} +(8,1,1) = {" +xT +uE +BV +gp +WO +LH +gi +HE +gp +gp +gp +BI +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(9,1,1) = {" +xT +uE +BV +Tc +pb +ju +gp +TS +gp +Ek +Ek +UY +IA +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(10,1,1) = {" +uE +BV +gp +gp +gp +gp +gp +HE +gp +ua +gp +Gt +cb +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(11,1,1) = {" +uE +BV +Tf +oO +gp +Ta +nl +DA +uT +sy +Ql +ya +SH +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(12,1,1) = {" +uE +BV +YT +rO +gp +Lo +nl +eI +ip +ot +lh +ya +Ek +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(13,1,1) = {" +Gt +gp +Cd +gp +gp +gp +wt +Zt +aN +ip +hC +ya +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(14,1,1) = {" +Gt +Pv +YT +nm +AQ +gp +HL +Hp +af +Wd +uW +rn +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(15,1,1) = {" +Gt +KW +YT +YT +YT +TS +wi +rl +lg +Rm +Re +Ln +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(16,1,1) = {" +Gt +gj +YT +nQ +nQ +gp +fc +hi +yQ +Wd +XB +QK +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(17,1,1) = {" +Gt +gp +Cd +gp +gp +gp +nl +En +dC +MW +wu +ya +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(18,1,1) = {" +uE +BV +YT +ab +oO +gp +AC +HE +MW +nw +qv +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(19,1,1) = {" +uE +BV +CY +oO +oO +gp +fh +DA +sy +sy +be +ya +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(20,1,1) = {" +uE +BV +gp +gp +gp +gp +gp +HE +Nk +Nk +gp +Gt +vS +hq +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(21,1,1) = {" +xT +uE +BV +Yf +fO +LH +gp +TS +gp +gp +Gt +Ci +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(22,1,1) = {" +xT +uE +BV +gp +fO +fO +fO +HE +LH +gR +gp +BI +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +xT +"} +(23,1,1) = {" +xT +xT +xT +CL +gp +LH +LH +HE +Bj +LH +wP +gp +Gt +xT +xT +Gt +gp +gp +gp +gp +gp +gp +gp +gp +gp +gp +gp +Gt +"} +(24,1,1) = {" +xT +xT +xT +xT +Gt +gp +LH +nl +LH +LH +LH +oo +gp +Gt +Gt +gp +er +LH +LH +LH +KJ +LH +LH +LH +KJ +gp +Gt +xT +"} +(25,1,1) = {" +xT +xT +xT +xT +xT +Gt +gp +nl +nl +nl +nl +nl +nl +nl +Bf +nl +nl +dr +LH +LH +Qu +KJ +LH +KJ +gp +Gt +xT +xT +"} +(26,1,1) = {" +xT +xT +xT +xT +xT +xT +Gt +gp +LH +zE +Fy +xm +xm +XY +gp +gp +jW +gp +KJ +KJ +To +LH +KJ +gp +BI +xT +xT +xT +"} +(27,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +Gt +gp +LH +Pk +LH +LH +xc +gp +gi +AW +gp +To +LH +LH +KJ +gp +Gt +xT +xT +xT +xT +"} +(28,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +xT +Gt +gp +gE +Pd +zl +xc +gp +rH +uV +rH +gp +LH +KJ +gp +Gt +xT +xT +xT +xT +xT +"} +(29,1,1) = {" +xT +xT +xT +xT +xT +xT +xT +xT +xT +Gt +gp +gp +gp +gp +Gt +xT +xT +xT +Gt +gp +gp +BI +xT +xT +xT +xT +xT +xT +"} diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index 71879d6e4759f6..61cf3cc1a4aa8e 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -1,6 +1,18 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space/basic, +/turf/template_noop, +/area/space) +"c" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"d" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/space) "e" = ( /obj/structure/chair/comfy/shuttle{ @@ -8,39 +20,94 @@ }, /turf/open/floor/plating, /area/space) +"g" = ( +/obj/structure/guncase, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/gun/ballistic/bolt_thrower, +/turf/open/floor/plating, +/area/space) "h" = ( -/turf/open/floor/engine/hull/reinforced, +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/turf/open/floor/plating, /area/space) "i" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ - dir = 8 +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/space) +"j" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/space) "l" = ( /obj/structure/minecart_rail{ dir = 4 }, -/turf/open/space/basic, +/turf/template_noop, +/area/space) +"n" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/plating, /area/space) "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/space) +"r" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) "s" = ( /obj/machinery/porta_turret/syndicate, /turf/closed/wall/mineral/plastitanium, /area/space) -"z" = ( +"u" = ( +/obj/machinery/computer/shuttle/pirate{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/plating, /area/space) -"B" = ( -/obj/machinery/computer/monitor{ +"v" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/turf/closed/wall/mineral/plastitanium, +/area/space) +"z" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"A" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"B" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/space) +"H" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/space) "I" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran + }, /turf/open/floor/plating, /area/space) "K" = ( @@ -49,13 +116,44 @@ }, /turf/open/floor/plating/airless, /area/space) -"S" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" +"L" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/space) +"M" = ( +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/plating, +/area/space) +"O" = ( +/turf/open/floor/plating, +/area/space) +"P" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating, /area/space) +"Q" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cell_10k, +/turf/open/floor/plating, +/area/space) +"R" = ( +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"S" = ( +/turf/closed/wall/mineral/plastitanium, +/area/space) "T" = ( /obj/structure/minecart_rail{ dir = 4 @@ -68,207 +166,129 @@ pixel_x = 16; pixel_y = 5 }, -/turf/open/space/basic, +/turf/template_noop, /area/space) -"V" = ( -/obj/machinery/computer/shuttle/pirate{ +"U" = ( +/obj/machinery/computer/monitor{ dir = 8 }, +/obj/machinery/turretid{ + pixel_y = -24 + }, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control"; + pixel_y = -34; + pixel_x = -3 + }, +/turf/open/floor/plating, +/area/space) +"V" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, /turf/open/floor/plating, /area/space) (1,1,1) = {" +K +K a a a a -a -a -a -a -a -a -a -a -a +K +K "} (2,1,1) = {" -a -a -a -a -a -h -h -a -a -a -a -h -h +o +o +B +d +R +B +o +o "} (3,1,1) = {" -a -a -a -a -a -h -h -K -K -K -K -h -h -"} -(4,1,1) = {" -a -a -a -a -a -h +o h o +j o o +i +o +"} +(4,1,1) = {" +o +A +c +L +H +H +H o -h -h "} (5,1,1) = {" -a -a -a -a -a -h -h o -z -z -I -h -h +M +n +L +O +O +g +o "} (6,1,1) = {" -a -a -a -a -a -h -h +v o +O +L +P I o -o -h -h +S "} (7,1,1) = {" -a -a -a -a -a l -h +S +o +Q +U o -z -e S -h a "} (8,1,1) = {" -a -a -a -a -a T a -o -z -B -o -a -a -"} -(9,1,1) = {" -a -a -a -a -a -a -a -S +V z e -S +V a a "} -(10,1,1) = {" -a -a -a -a -a +(9,1,1) = {" a a -S V -i -S +u +r +V a a "} -(11,1,1) = {" -a -a -a -a -a +(10,1,1) = {" a a s -S -S +V +V s a a "} -(12,1,1) = {" -a -a -a -a -a -a -a -a -h -h -a -a -a -"} -(13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index 90d775228d4271..765b09bac57e2b 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -1,40 +1,26 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ao" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/space) "bn" = ( /turf/closed/wall/mineral/plastitanium, /area/space) "cv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "cE" = ( /obj/machinery/space_heater, /turf/open/floor/plating, /area/space) "do" = ( -/obj/machinery/turretid{ - ailock = 1; - desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; - lethal = 1; - name = "Ship Turret Control"; - pixel_x = 30; - pixel_y = 4; - req_access = list("syndicate") +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/obj/machinery/shuttle_scrambler, -/turf/open/floor/iron/dark/textured, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "dO" = ( /obj/effect/turf_decal/tile/red/half{ @@ -46,13 +32,9 @@ /area/space) "ee" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "ex" = ( /obj/effect/turf_decal/tile/red/half{ @@ -67,15 +49,11 @@ /turf/open/floor/plating, /area/space) "fA" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 6 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/smooth_corner, +/obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron/dark/smooth_large, /area/space) "fF" = ( /obj/structure/railing{ @@ -105,12 +83,15 @@ /turf/open/floor/iron/dark, /area/space) "kd" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/space) +"kf" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/plating, /area/space) "kC" = ( /obj/structure/minecart_rail, @@ -121,15 +102,38 @@ /turf/open/floor/plating, /area/space) "lS" = ( -/obj/item/radio/intercom/syndicate/directional/north, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"lW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/turf/open/floor/plating, +/area/space) +"lY" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 6 }, -/turf/open/floor/iron/dark/smooth_large, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner, +/area/space) +"mJ" = ( +/obj/structure/railing{ + color = "#36373a" + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/space) +"nt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "nD" = ( /obj/machinery/porta_turret/syndicate{ @@ -137,10 +141,21 @@ }, /turf/closed/wall/mineral/plastitanium, /area/space) +"oF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space) "oS" = ( /obj/machinery/vending/imported/tiziran, /turf/open/floor/plating, /area/space) +"pk" = ( +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile/pirate, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) "pF" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 8 @@ -157,26 +172,68 @@ /turf/open/floor/catwalk_floor/iron_dark/airless, /area/space) "qc" = ( -/obj/structure/chair/bronze, -/turf/open/floor/iron/dark/smooth_half, +/obj/item/radio/intercom/syndicate/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, /area/space) "qm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +/obj/structure/shelf, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = 2; + pixel_y = -1 }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/plating, /area/space) "qp" = ( /obj/structure/girder/reinforced, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/space) +"qL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/space) +"rs" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) "rA" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, /turf/open/floor/iron/dark, /area/space) +"sa" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) "te" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/button/door{ @@ -185,6 +242,14 @@ }, /turf/open/floor/iron/dark/textured, /area/space) +"ti" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) "tX" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 1 @@ -209,10 +274,7 @@ /turf/open/floor/plating, /area/space) "wF" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/space) "wI" = ( @@ -229,6 +291,21 @@ }, /turf/open/floor/iron/dark, /area/space) +"xv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) +"xT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space) "yj" = ( /obj/machinery/computer/shuttle/pirate{ dir = 1 @@ -280,18 +357,36 @@ /turf/open/floor/iron/dark, /area/space) "zv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/red/half{ dir = 4 }, -/turf/open/floor/plating, +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/space) +"zR" = ( +/obj/structure/chair/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, /area/space) "zT" = ( /obj/structure/railing/eva_handhold/directional/east, /turf/closed/wall/mineral/plastitanium, /area/space) "zX" = ( -/obj/structure/shelf, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, /turf/open/floor/plating, /area/space) "Ag" = ( @@ -312,19 +407,11 @@ /turf/open/floor/plating, /area/space) "AT" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_y = 20; - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/obj/item/clothing/head/helmet/skull{ - pixel_x = 5; - pixel_y = -3 - }, -/turf/open/floor/iron/dark/smooth_half, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, /area/space) "Ba" = ( /turf/open/floor/iron/dark, @@ -334,17 +421,47 @@ /turf/closed/wall/mineral/plastitanium, /area/space) "Bi" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/space) "Bm" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, /area/space) +"BS" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow + }, +/turf/open/floor/plating, +/area/space) +"Cm" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/obj/structure/marker_beacon/burgundy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/space) "Dl" = ( /obj/structure/fluff/sat_dish, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/space) +"Dp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/space) "Dv" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ @@ -359,11 +476,16 @@ /turf/open/floor/plating, /area/space) "Em" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/space) +"Eq" = ( +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red + }, +/turf/open/floor/plating, +/area/space) "EI" = ( /obj/structure/minecart_rail, /obj/structure/marker_beacon/burgundy{ @@ -385,12 +507,26 @@ }, /turf/open/floor/iron/dark/textured, /area/space) +"FQ" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) "GI" = ( /obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/plating, /area/space) +"Id" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/space) "In" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/space) @@ -426,30 +562,14 @@ /turf/open/floor/catwalk_floor/iron_dark/airless, /area/space) "JM" = ( -/obj/structure/shelf, -/obj/item/gun/ballistic/rifle/bolt_thrower, -/obj/item/gun/ballistic/rifle/bolt_thrower{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/gun/ballistic/rifle/bolt_thrower{ - pixel_y = 10; - pixel_x = -8 - }, +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, /turf/open/floor/plating, /area/space) "JW" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "LG" = ( /turf/open/floor/plating, @@ -463,19 +583,29 @@ "MZ" = ( /turf/template_noop, /area/space) -"QC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"Nx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"OC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/space) +"QC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/space) "Rf" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/space) "RO" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/structure/shelf, +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, /turf/open/floor/plating, /area/space) "Sf" = ( @@ -488,20 +618,33 @@ /turf/open/floor/iron/dark, /area/space) "SG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +/obj/machinery/turretid{ + ailock = 1; + desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + icon_state = "control_kill"; + lethal = 1; + name = "Ship Turret Control"; + pixel_x = 30; + pixel_y = 4; + req_access = list("syndicate") }, -/turf/open/floor/plating, +/obj/machinery/shuttle_scrambler, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, /area/space) "SI" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/space) "Ti" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_half, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/space) +"Tl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, /area/space) "Tu" = ( /obj/structure/shelf, @@ -536,14 +679,19 @@ }, /turf/open/floor/iron/dark/textured, /area/space) +"Vi" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/space) "VR" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, -/obj/structure/sign/flag/tizira/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, /area/space) "VT" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ @@ -561,11 +709,8 @@ /turf/open/floor/iron/dark, /area/space) "WA" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, /area/space) "Xw" = ( /obj/structure/chair/comfy/shuttle{ @@ -602,41 +747,8 @@ MZ MZ MZ MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -"} -(2,1,1) = {" -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ ht -TK +pk SI In In @@ -654,10 +766,8 @@ MZ MZ MZ MZ -MZ "} -(3,1,1) = {" -MZ +(2,1,1) = {" MZ MZ MZ @@ -668,7 +778,7 @@ MZ MZ bn In -Rf +nt In LG LG @@ -686,10 +796,8 @@ MZ MZ MZ MZ -MZ "} -(4,1,1) = {" -MZ +(3,1,1) = {" MZ MZ MZ @@ -700,12 +808,12 @@ MZ bn In In -WA +cv In -wF -wF -kd -zv +Ti +Ti +rs +Tl XN lr LG @@ -718,10 +826,8 @@ MZ MZ MZ MZ -MZ "} -(5,1,1) = {" -MZ +(4,1,1) = {" MZ MZ MZ @@ -734,10 +840,10 @@ Sf LG Em LG -wF +Ti LG In -LG +xT LG Bm LG @@ -750,10 +856,8 @@ Bf MZ MZ MZ -MZ "} -(6,1,1) = {" -MZ +(5,1,1) = {" MZ MZ MZ @@ -761,12 +865,12 @@ MZ MZ bn In -wF -wF -wF -wF -wF -wF +Ti +Ti +Ti +Ti +Ti +Ti LG AC LG @@ -782,10 +886,8 @@ In bn MZ MZ -MZ "} -(7,1,1) = {" -MZ +(6,1,1) = {" MZ MZ MZ @@ -793,7 +895,7 @@ MZ bn In LG -wF +Ti LG LG LG @@ -814,10 +916,8 @@ Bm In bn MZ -MZ "} -(8,1,1) = {" -MZ +(7,1,1) = {" MZ MZ MZ @@ -825,8 +925,8 @@ nD In oS LG -wF -LG +ee +lW LG LG In @@ -846,18 +946,16 @@ In In In bn -MZ "} -(9,1,1) = {" -MZ +(8,1,1) = {" MZ Ag tX In GI LG -LG -wF +WA +ee In In In @@ -878,10 +976,8 @@ MZ MZ MZ MZ -MZ "} -(10,1,1) = {" -MZ +(9,1,1) = {" MZ Ag tX @@ -889,7 +985,7 @@ cE IB iJ In -kd +VR In pW pW @@ -910,10 +1006,8 @@ MZ MZ MZ MZ -MZ "} -(11,1,1) = {" -MZ +(10,1,1) = {" Ag tX In @@ -921,7 +1015,7 @@ In In In In -wF +ee In gG In @@ -942,24 +1036,21 @@ MZ MZ MZ MZ -MZ "} -(12,1,1) = {" -MZ +(11,1,1) = {" Ag tX -Bi +qL Ba In IS -wF -ee -Rf -Rf -LS -AC -MZ -MZ +Ti +xv +do +lS +Vi +zX +mJ MZ MZ MZ @@ -976,22 +1067,20 @@ MZ MZ MZ "} -(13,1,1) = {" -MZ +(12,1,1) = {" Ag tX QC -Ba +sa In Xw -wF -Rf +Ti +Nx VY xm Tv -AC -MZ -MZ +zX +pW MZ MZ MZ @@ -1008,22 +1097,20 @@ MZ MZ MZ "} -(14,1,1) = {" -MZ +(13,1,1) = {" bn In -ao +FQ In In In -wF -fA +ti +lY ex VY Un -AC -AC -MZ +zX +zX MZ MZ MZ @@ -1040,22 +1127,20 @@ MZ MZ MZ "} -(15,1,1) = {" -MZ +(14,1,1) = {" bn -Ba +ao QC pO -Bi +OC In -VR -AT +fA +zv YF zk te LS -AC -MZ +zX MZ MZ MZ @@ -1072,22 +1157,20 @@ MZ MZ MZ "} -(16,1,1) = {" -MZ +(15,1,1) = {" bn rA QC QC QC -kd -cv -qc +VR +AT +zR wI At SA yj -AC -MZ +zX MZ MZ MZ @@ -1104,22 +1187,20 @@ MZ MZ MZ "} -(17,1,1) = {" -MZ +(16,1,1) = {" bn Is QC jl jl In -lS -Ti +qc +Id fF zk pF VT -AC -MZ +zX MZ MZ MZ @@ -1136,22 +1217,20 @@ MZ MZ MZ "} -(18,1,1) = {" -MZ +(17,1,1) = {" bn In -ao +FQ In In In -wF -JW +Ti +Cm dO uo vw -AC -AC -MZ +zX +zX MZ MZ MZ @@ -1168,21 +1247,19 @@ MZ MZ MZ "} -(19,1,1) = {" -MZ +(18,1,1) = {" Ag tX QC -Bi +Dp Ba In -qm -wF +JW +ee uo Dv Fd -AC -MZ +zX MZ MZ MZ @@ -1200,21 +1277,19 @@ MZ MZ MZ "} -(20,1,1) = {" -MZ +(19,1,1) = {" Ag tX -Ba +Bi Ba Ba In -Rf -ee -Rf -Rf -do -AC -MZ +wF +xv +lS +lS +SG +zX MZ MZ MZ @@ -1232,8 +1307,7 @@ MZ MZ MZ "} -(21,1,1) = {" -MZ +(20,1,1) = {" Ag tX In @@ -1241,7 +1315,7 @@ In In In In -wF +ee Rf Rf In @@ -1262,18 +1336,16 @@ MZ MZ MZ MZ -MZ "} -(22,1,1) = {" -MZ +(21,1,1) = {" MZ Ag tX DB -SG +kd LG In -kd +VR In In bn @@ -1294,20 +1366,18 @@ MZ MZ MZ MZ -MZ "} -(23,1,1) = {" -MZ +(22,1,1) = {" MZ Ag tX In -SG -SG -SG -wF -LG +kd +kd +kd +ee LG +BS In Bf MZ @@ -1326,10 +1396,8 @@ MZ MZ MZ MZ -MZ "} -(24,1,1) = {" -MZ +(23,1,1) = {" MZ MZ MZ @@ -1337,10 +1405,10 @@ nD In LG LG -wF -LG -LG +ee +lW LG +Eq In bn MZ @@ -1358,10 +1426,8 @@ In In In bn -MZ "} -(25,1,1) = {" -MZ +(24,1,1) = {" MZ MZ MZ @@ -1369,16 +1435,16 @@ MZ bn In LG -wF -LG +Ti LG LG LG +kf In bn bn In -LG +oF LG LG LG @@ -1390,10 +1456,8 @@ Bm In bn MZ -MZ "} -(26,1,1) = {" -MZ +(25,1,1) = {" MZ MZ MZ @@ -1401,16 +1465,16 @@ MZ MZ bn In -wF -wF -wF -wF -wF -wF -wF -kd -wF -wF +Ti +Ti +Ti +Ti +Ti +Ti +Ti +rs +Ti +Ti XN LG LG @@ -1422,10 +1486,8 @@ In bn MZ MZ -MZ "} -(27,1,1) = {" -MZ +(26,1,1) = {" MZ MZ MZ @@ -1435,14 +1497,14 @@ MZ bn In LG -LG +xT Yq vV vV RO In In -WA +cv In Bm Bm @@ -1454,10 +1516,8 @@ Bf MZ MZ MZ -MZ "} -(28,1,1) = {" -MZ +(27,1,1) = {" MZ MZ MZ @@ -1473,7 +1533,7 @@ LG LG JM In -LG +WA Em In lr @@ -1486,10 +1546,8 @@ MZ MZ MZ MZ -MZ "} -(29,1,1) = {" -MZ +(28,1,1) = {" MZ MZ MZ @@ -1502,8 +1560,8 @@ bn In Tu yW -LG -zX +qm +JM In zT TK @@ -1518,10 +1576,8 @@ MZ MZ MZ MZ -MZ "} -(30,1,1) = {" -MZ +(29,1,1) = {" MZ MZ MZ @@ -1550,5 +1606,4 @@ MZ MZ MZ MZ -MZ "} diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 1c639ab90262a9..ee3b0a1c962e3c 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -237,7 +237,7 @@ . += "[icon_state]_toy" - if(!magazine || internal_magazine || !mag_display) + if(!magazine || !mag_display) //DOPPLER EDIT originally if(!magazine || internal_magazine || !mag_display) this allows guns with internal magazines to use the mag display function. return if(special_mags) diff --git a/modular_doppler/modular_cosmetics/code/head/head.dm b/modular_doppler/modular_cosmetics/code/head/head.dm index d51061227df80f..dfa72bd820e720 100644 --- a/modular_doppler/modular_cosmetics/code/head/head.dm +++ b/modular_doppler/modular_cosmetics/code/head/head.dm @@ -100,3 +100,21 @@ playsound(src, SFX_VISOR_UP, 20, TRUE, -1) balloon_alert(user, "mouth covered") return CLICK_ACTION_SUCCESS + +/obj/item/clothing/head/helmet/space/pirate/tiziran_raider + name = "Tiziran EVA helmet" + desc = "An EVA-rated helmet specially suited to Tiziran physiology. Originally developed for special operations, time and surplusing \ + have diffused this style of helmet across Tiziran-controlled space." + icon = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi' + icon_state = "tiziran_raider" + worn_icon_state = "tiziran_raider" + armor_type = /datum/armor/space_pirate + +/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red + icon_state = "tiziran_raider_red" + worn_icon_state = "tiziran_raider_red" + +/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow + icon_state = "tiziran_raider_yellow" + worn_icon_state = "tiziran_raider_yellow" diff --git a/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm index 6b88c3ebbd4f0b..2852a878aafd64 100644 --- a/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm +++ b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm @@ -1,2 +1,29 @@ -/obj/item/clothing/head/helmet/space/pirate/tiziran_raider +/obj/item/clothing/suit/space/pirate/tiziran + name = "Tiziran EVA suit" + desc = "An EVA rated suit designed for Tiziran physiology. Its broad availability makes it a popular choice even beyond its issue to \ + Imperial operators." + icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/spacesuit.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi' + icon_state = "tiziran_raider" + worn_icon_state = "tiziran_raider" + w_class = WEIGHT_CLASS_NORMAL + allowed = list( + /obj/item/gun, + /obj/item/melee, + /obj/item/restraints/handcuffs, + /obj/item/tank/internals, + ) + armor_type = /datum/armor/space_pirate + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit.dmi', + BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/spacesuit_digi.dmi') + +/obj/item/clothing/suit/space/pirate/tiziran/red + icon_state = "tiziran_raider_red" + worn_icon_state = "tiziran_raider_red" + +/obj/item/clothing/suit/space/pirate/tiziran/yellow + icon_state = "tiziran_raider_yellow" + worn_icon_state = "tiziran_raider_yellow" diff --git a/modular_doppler/modular_cosmetics/icons/obj/suit/spacesuit.dmi b/modular_doppler/modular_cosmetics/icons/obj/suit/spacesuit.dmi index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..324805a9abe2d2fcd34f5609278ee7e56e101784 100644 GIT binary patch literal 1300 zcmV+v1?&2WP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sU)*1vnVkyz9=y>CACP2i!&v&s2C_=$iV_Y9svMWL_c9aWX96~00c})L_t(|ob6g$NK`=>o}$ZxghAO- zQN&he1yPEL8%bpswWJ5Bha#xJ$f&n^s1yqf9~62JN{H$q3JQ8DNRTd~6s2hwinNP~ zWVVG+kPt#``;Gml*=^aKb9QE@BjU%$(b2X1s&WO)S}tvK7EQ({)865{cYX?_U_4R1`&un8fXXk)Amk={;K8$ z;(s+1WDr3$e?kjLOG~p#h;V!2O^XabDUyr*RY1HRM3~&9mOrkU@EJB^CJTNUWW&S5 z{G#wV0A#@Cn*H1@fHyC@t$uV~Z*Q+-SCHY~=g;JBp@W~BQGVVkYneewOAy*oVr9St zN&m$Y}50N_CKt zsjWG>iwn@WyqLx6o6Kq;!@tuvn+veJug?*`t--&8C!!nC{QW<^v$j9&PWYwOLWD(2k2u>#&(2tq zjvS~^ZUwsdr9)vvUB_!1A_5W76w!|V#pp~Wbn)AI84`)1Iwlx;3aNxjen&1qK?nvw zvn^gofK<4EN`6N!KMSQn$QvBuAcESg9h7!Arz{I=qNnmt9V zBruB~-+J(o?Wj7#P9H4$r%e}h@Y@pLYFiI4K}g3aQ3pA->4H)IuXk!f(f)?^Xum{1 zH}TuD0Iat?R}Qg7I~pQpVUSb1PMGHR;9(3x+q=6gT3T9+@;iDN8cXm5Fg*a%@B}bD z0Ml?Jfa&}Im9Qni^ZOe@B?Y<0@&j~0T7dJ_oB7R^t({>cKR_3x^8>Em`y4)+!LD_M zQl1~66Vmwsojv^wBBVM$KsRjV2S9|MiudPDBd!I++MfsLX6sL$VB53DSz^#PdfK_w z{f$rs;#vUTaL5=f>B9p(Wtcf`G1$XPU(#|Eb^z2bGd`}3y12PB;z(EVX3ygWMJpEnKZ zNDvVoMSbFqEJ}z#(V^QSLD%F5=z=Tr15`qK4tUhsYy~`k=mG%#qo~kLa7})IE=UWo ztuVlUXY1?uQy2H=QAa!VaTBBkpeId;b^$=N47b2l`2jlMs{8;QkQM;@?%CxR*u!Tp zSmnjPOCRdl6amIW5o0TOyf6b(Xo&}Xq@!`0000< KMNUMnLSTYa18PkG literal 0 HcmV?d00001 diff --git a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm index a01b2843f3c394..c9d7fbbc3bfe0f 100644 --- a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm +++ b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm @@ -32,3 +32,6 @@ max_ammo = 4 casing_w_spacing = 2 casing_z_padding = 6 + +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full + start_empty = FALSE diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index 984a5fff9e92a2..5bbf0117fb8753 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -14,6 +14,8 @@ slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bolt_thrower internal_magazine = TRUE + mag_display = TRUE + mag_display_ammo = TRUE fire_delay = 10 fire_sound = 'modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg' weapon_weight = WEAPON_HEAVY diff --git a/modular_doppler/modular_weapons/icons/obj/guns32x.dmi b/modular_doppler/modular_weapons/icons/obj/guns32x.dmi index 2df0b49afbf6c4a404392019a2adbfcc445ba181..4ef3aff1976dd967a8f60941bdf9aac1d516af3c 100644 GIT binary patch delta 267 zcmV+m0rdXUDbp#CI)BZo!Y~j<*UeJ|-Ak=S+}zDY5f}OjA)2ubHc3fF#kaS#3tgDM z-3**F44IG2>HltjIMMC#KptS7G@Aa=dQp<%DFwDev#LnZf^1rx8iyQVC}#q2MhYRV z8@eSau9hp9>TiZQ1n81TWdvBAEu?KB8_m+#r7Uj}bqnzMq*k4p`q`K6L$? z9+$w@nkU%k=x;cjm5}7iOUUtMCgk{X6LNgn2{=AsPIss6_{F^eacX&Ix0+~a000w^ RNklZL>H5n-ls1eoX)X delta 267 zcmV+m0rdXUDbp#CI)A@v!!QtsXX`11vj^KXrAwBOP%_l7Ae880i&&D8t_^wn8hc2F z=-+k+-*+6kAKK9U@%z-#!_SHQfpyYox})v3BE?+_9OmYuA;kc)A8>6Pa)h}o1z<@E zA+4LcniN;d6|D6u!yE#PNu)9Ytj-qFwvfH%X;XVMiYVx$7JuA6Oftw6@3UZ5SJiu= z@d#g;{AVWLX7Wu24{E|k6u)sRRrD1XD(Ssf@@z(Aqq*E5e)p#lKc@aYGi@BOX}Ub= z_C38UfrB-7u+h=4a5yU=$(NUq;<-__1^Dk;olI;d8000w^ RNklZL>H5n-dmcgM Date: Fri, 28 Nov 2025 17:33:08 -0800 Subject: [PATCH 09/38] puts those back --- tgstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 51938a385ae72b..1d0d6c39dde06f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7173,6 +7173,7 @@ #include "modular_doppler\modular_cosmetics\code\storage\medical\backpacks.dm" #include "modular_doppler\modular_cosmetics\code\storage\medical\base_overrides.dm" #include "modular_doppler\modular_cosmetics\code\suits\basesuits.dm" +#include "modular_doppler\modular_cosmetics\code\suits\cargo.dm" #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm" #include "modular_doppler\modular_cosmetics\code\suits\labcoat.dm" #include "modular_doppler\modular_cosmetics\code\suits\mining.dm" @@ -7693,6 +7694,7 @@ #include "modular_doppler\ships_r_us\code\order_console.dm" #include "modular_doppler\ships_r_us\code\shuttle_lockers.dm" #include "modular_doppler\ships_r_us\code\shuttle_parts.dm" +#include "modular_doppler\ships_r_us\code\wirefix.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\big_boy.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\ferries.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\incomplete.dm" From 639b630cbd1a21619e76a2dc874aae2d181ed920 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 29 Nov 2025 03:20:51 -0800 Subject: [PATCH 10/38] more stuff, breaks compile for no good reason --- code/__DEFINES/~doppler_defines/text.dm | 3 ++ .../antagonists/pirate/pirate_gangs.dm | 2 +- .../pirates/tiziran_raiders.dm | 26 +++++++++--------- .../modular_weapons/code/guns/bolt_thrower.dm | 6 ++-- .../icons/mob/inhands/gun_lefthand.dmi | Bin 4090 -> 4895 bytes .../icons/mob/inhands/gun_righthand.dmi | Bin 4027 -> 4902 bytes .../modular_weapons/icons/mob/worn/guns.dmi | Bin 4149 -> 4896 bytes .../ships_r_us/code/order_console.dm | 1 + .../code/shuttle_templates/antag_ships.dm | 4 +-- .../doppler_pirate_names.json | 0 10 files changed, 24 insertions(+), 18 deletions(-) rename modular_doppler/modular_antagonists/pirates/ship_names.json => strings/doppler_pirate_names.json (100%) diff --git a/code/__DEFINES/~doppler_defines/text.dm b/code/__DEFINES/~doppler_defines/text.dm index f95563090bf401..0318fae8477422 100644 --- a/code/__DEFINES/~doppler_defines/text.dm +++ b/code/__DEFINES/~doppler_defines/text.dm @@ -6,3 +6,6 @@ return "an" else return "a" + +//for modular doppie pirates +#define DOPPLER_PIRATE_NAMES_FILE "doppler_pirate_names.json" diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index bb7451e212a06a..8469fbdb718061 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) /datum/pirate_gang/New() . = ..() - ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) + ship_name = pick(strings(PIRATE_NAMES_FILE || DOPPLER_PIRATE_NAMES_FILE, ship_name_pool)) //DOPPLER EDIT originally ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) allows us to use a modular json for this ///whether this pirate gang can roll today. this is called when the global list initializes, so ///returning FALSE means it cannot show up at all for the entire round. diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index b4f330c79e2f40..4206f12260ce80 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -1,8 +1,8 @@ /datum/pirate_gang/tiziran name = "Tiziran Raiders" is_heavy_threat = TRUE - ship_template_id = "kaz'akran" -// ship_name_pool = "" + ship_template_id = "tiziran_raider_shuttle" + ship_name_pool = "tiziran_ships" threat_title = "Submit or Die!" threat_content = "Your warriors are weak and your masters are far from here. Surrender %PAYOFF credits to %SHIPNAME, or we will take what is ours!" @@ -11,7 +11,7 @@ response_received = "We have taken what is ours!" response_too_late = "We wait no longer! Perish!" - response_not_enough = "This is an insult. Perish!" + response_not_enough = "This is an insult! Perish!" /datum/outfit/pirate/tiziran name = "Tiziran Raider" @@ -26,16 +26,16 @@ shoes = /obj/item/clothing/shoes/lizard_shins belt = /obj/item/storage/belt/lizard_sabre -/*/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran - name = "\improper " - desc = "" - you_are_text = "" - flavour_text = "" - prompt_name = "" +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran + name = "\improper Tiziran sleeper" + desc = "A cryogenic stasis bed for long term space travel. Tizirans find the brief window of consciousness before hypersleep spares them the \ + chill especially unpleasant." + you_are_text = "Whether privateer or private pirate, you are a crew of Tiziran raiders terrorizing the sector's merchant-spacers." + flavour_text = "This utopist installation sits on a wealth of libre and minerals it can't protect. Shame for them." + prompt_name = "Tiziran raider" outfit = /datum/outfit/pirate/tiziran - rank = "" + rank = "swabbie" /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain - rank = "" - outfit = -*/ + name = "\improper Tiziran command sleeper" + rank = "captain" diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index 5bbf0117fb8753..b5c9bf92ee0bf1 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -10,6 +10,10 @@ when field operators overtune their coils for greater penetration until the projectile spall itself ignites." icon = 'modular_doppler/modular_weapons/icons/obj/guns32x.dmi' icon_state = "bolt_thrower" + worn_icon = 'modular_doppler/modular_weapons/icons/mob/worn/guns.dmi' + worn_icon_state = "bolt_thrower" + lefthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/gun_lefthand.dmi' + righthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/gun_righthand.dmi' inhand_icon_state = "bolt_thrower" slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bolt_thrower @@ -19,8 +23,6 @@ fire_delay = 10 fire_sound = 'modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg' weapon_weight = WEAPON_HEAVY - bolt_wording = "mass driver" - magazine_wording = "hopper" cartridge_wording = "slug" /obj/item/ammo_box/magazine/internal/bolt_thrower diff --git a/modular_doppler/modular_weapons/icons/mob/inhands/gun_lefthand.dmi b/modular_doppler/modular_weapons/icons/mob/inhands/gun_lefthand.dmi index 1636923e09cbb6b199c7d837711dd7cfc8359018..3ce3e55d6adfcbd2856c9b91742b8083c8cb0828 100644 GIT binary patch literal 4895 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 P&0%E@HmkmRC+0r@%Q4zZ literal 4090 zcmZuzXHXOB(nbY5SU^DqMT$Zwhju`bCPWd0aHvY}MM{h`fdmNw6&p1w(i8|yKm!C6 zLMIkF2m}&JLT^DJA+%7^F5i4V?#wy&o!Q;l-I@LI?C!H~ytSpt$zvCe@$m4R1eqG$ zIk3|Q^6d})11<3+c;vufqHG<*jeNs=9)d%{!NEa1JdxRHZyE)E{B^>ZGOttsHEFUx zM>rOdhkI-ec}2Ybr{149tK&yRjy<55bqI}p)EO=*)+E;BMZQ>{SoCC|YwU%VQ*(X> zq0@{T$XkMMrDu|i&xm>F+gU09{l;F4A9+03z`jHJ8syP*%79K&euX9TCy79#QCPZY=3XpG7}E-dZ&3cys>JWGlE(KGV;?^+sF$kJ*|CG)FhW~t~MUcg?9wR3=dsfsR7{h)uUS;Qk7_pE*?T283l4!t57-cPVrO|z;T_( zgfPp;ny&0_bp$6+Z%u0Na5rIbvZGp z_f?PwBgHn#M=Xw40IjxMk-n|xnmPFOfcDu>$4$FRmuUhH^7<)LldK2w7$obwzGkuGBM9(1|N^ z3IH;qDqiTl2A+%C%eJfg0&~veB}h~*J9cXn(d?I$&2CJDCN>ow{^xN0%fBV!v6p=F zJ0{F29De~q#^^b{YtW6NT8s8!90Kez8m3|r^!(?$W*A7JizlTpd#&X)n^Ou)!UNs?5TbCU9n*iR`*~CS?ViCOR#ZC{hXCv$|E;d ziDv?Z4#D1UaEAJ-BK;9q%=0j}6eG3Q$RlbFpO`FB4U}CF4H#kC=~DEy;X*TUo|9^e^215qSJWeYXWIX$tZP z1p4fWjyL`GuOBOny0TydgTd&dSd+U_sNeT|hrJ;q+N{e8v!ZhN>7AqxVlD1ON3k{? zYvUV)H4ca4{3PS{T&e@Qs#fd^RzJeF77mS#b<5AFqxw}(K`_mWgK}QQ-!=&)kO-U4 zp9MslJ4eQ&eIix2J1}u|tlYL4EI*ultM&z%GEqs$iCX?t6PaLc2&|B$Rvd7`l76hA z+eAn3b-E{&eOcsIDlq88;v_aNsQ1A|@wPXx)lJ#F{l7{mIkd?ZDP0#MraQ@|Hjsc@ zGW1;Ubjn~foTgYnkJbi;zJyZ4$*2i}M#Z@3k8U-m%L<{bYVrWDtTHXDuuxdpQqF32 zY7BI?Dj1M2To0`{EZ?a5OfpdT(-!GquTQSXEZh8Wj(5Qh^GCPyQ5vV}wyy8IjAdtT zB2_j7i|RJ2(GSBCoRn$TMXp^SdvG`=<0G7i4=!BRB3-lXzK{I1m}}6`(0K`FlfWn( zigejbZ6WPNq%2{H_DO@$HAdILTMAmytY;0fCw9PZU)8I%dZMlTQ)e7hb1&E*!ruQ@ zK#hejjum%^YStI7-wSjR2v8T5_^`WvUR|Z+{ zbZ61)J3Gi>(ul-WXH8Sh@iIRbN8N6{;6kwnjrf-2<)6Rz5-^h`Zi%$iB#p)FPtW%{3;>N@5BG zGXRk()%-ujJ`OI;`8SGp&O?k+WqvRxPi71vCLhUDd}45v`%YW=CUc%1zpL#O=vU$+&qERvQy{6AQ9`ibeirP4^d`q> zb$zbGDrCfM-`hmCo@Q%2#b#l*NBfRXy2Wm%O<&oh)Du^< z8ZM_=Q&m}UR@J^Jgmd&T@GBmWtclf5l;h5Kr5@4W2hO!8qX8%b!C&74n>tn(^NtuYZQan~=&w{jE!!il%+(Q`8(=UMcI5eNnt%6{h~LaFgd zT_?~Hfh#tm@X<;ydGmdzuYN~ATw~`kn(Pjf81EEC>)jettV{un&Nqbf#(PD-j1`>fz^x#D=g-t+rm7w@R*r7-wo>O*54bbBci@s|8}R;v66ioTx?M+&6?+~38Pd;y)x$oy5BEMts? z@QuX=P|n;>A*iiz!ak>KZ*w9eLm7NN_NSJ-t2U5vWwnozUVZUY?BHS+j}s|AQ4iEx zzME+HR<8=sJFnAY8L1Xz)A@B;QNSXd4`U9N^GRou)ArxUa#E7!PZr^Sd71r`kryJXIHA=DHk<7>oE})K)Obs&PZ<&X5kESwPQblW9O8jG@0G%En=I)r zqb>Q-MBwmn_W%F@ diff --git a/modular_doppler/modular_weapons/icons/mob/inhands/gun_righthand.dmi b/modular_doppler/modular_weapons/icons/mob/inhands/gun_righthand.dmi index 8f59b1cb327877707caf416a26f6dbe1ab48390a..24ce75436bb20f63c6e3d24e818d968850512b69 100644 GIT binary patch literal 4902 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 GPWeBE?8-p^ literal 4027 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 ZMq$VC9&kfC&;9`b>dM+ml?s+2{{?8X Date: Tue, 16 Dec 2025 00:03:11 -0800 Subject: [PATCH 11/38] uweh --- .../~doppler_shuttles/tiziran_corvette.dmm | 226 +++++++++--------- .../~doppler_shuttles/tiziran_interceptor.dmm | 62 ++--- .../tiziran_raider_shuttle.dmm | 6 +- .../code/shuttle_templates/antag_ships.dm | 6 +- tgstation.dme | 1 + 5 files changed, 152 insertions(+), 149 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index f766e57bea9ca8..166ebe4876fd02 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -5,7 +5,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "af" = ( /obj/structure/railing{ color = "#36373a" @@ -14,7 +14,7 @@ dir = 4 }, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "aN" = ( /obj/effect/turf_decal/tile/red/half{ dir = 1 @@ -22,7 +22,7 @@ /turf/open/floor/iron/dark/smooth_corner{ dir = 4 }, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "be" = ( /obj/machinery/turretid{ ailock = 1; @@ -37,17 +37,17 @@ /obj/structure/cable, /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "cb" = ( /obj/machinery/deployable_turret/snub_particle_cannon{ pixel_y = -5 }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "dr" = ( /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "dC" = ( /obj/effect/turf_decal/tile/red/half{ dir = 1 @@ -55,17 +55,17 @@ /turf/open/floor/iron/dark/smooth_corner{ dir = 1 }, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "er" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "eI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "fc" = ( /obj/item/radio/intercom/syndicate/directional/north, /obj/structure/cable, @@ -74,33 +74,33 @@ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "fh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "fO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gj" = ( /obj/structure/closet/crate/secure/plasma, /obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gp" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gE" = ( /obj/structure/shelf, /obj/item/melee/tizirian_sword{ @@ -113,21 +113,21 @@ pixel_x = 5 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "gR" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "hi" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "hq" = ( /obj/structure/minecart_rail, /obj/structure/marker_beacon/burgundy{ @@ -139,42 +139,42 @@ pixel_y = -14 }, /turf/template_noop, -/area/space) +/area/template_noop) "hC" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "hQ" = ( /obj/machinery/vending/imported/tiziran, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "ip" = ( /obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "ju" = ( /obj/structure/chair/plastic{ dir = 1 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "jW" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "lg" = ( /obj/structure/railing{ color = "#36373a" }, /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "lh" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 1 @@ -183,50 +183,50 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "mZ" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "nl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "nm" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "nw" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "nQ" = ( /obj/machinery/power/micro_reactor, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "oo" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; suit_type = /obj/item/clothing/suit/space/pirate/tiziran }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "ot" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "oO" = ( /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "pb" = ( /obj/item/rolling_table_dock, /obj/effect/spawner/random/vendor_meal_sides/tizira, @@ -235,7 +235,7 @@ pixel_x = -9 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "qv" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 1 @@ -244,58 +244,58 @@ dir = 8 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "rl" = ( /obj/structure/chair/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "rn" = ( /obj/machinery/computer/monitor{ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "rF" = ( /obj/machinery/door/airlock/external, /obj/docking_port/mobile/personally_bought, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "rH" = ( /obj/structure/railing/eva_handhold/directional/east, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "rO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "sy" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "ua" = ( /obj/machinery/door/airlock/external, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "uE" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "uT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "uV" = ( /obj/machinery/door/airlock/external, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "uW" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/button/door{ @@ -303,22 +303,22 @@ name = "Window Shutters Control" }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "vq" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "vS" = ( /obj/structure/minecart_rail, /turf/template_noop, -/area/space) +/area/template_noop) "wi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "wt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -326,33 +326,33 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "wu" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "wP" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "xc" = ( /obj/item/gun/ballistic/bolt_thrower, /obj/structure/guncase, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "xm" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "xT" = ( /turf/template_noop, -/area/space) +/area/template_noop) "ya" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" @@ -360,7 +360,7 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "yQ" = ( /obj/structure/railing{ color = "#36373a" @@ -369,7 +369,7 @@ dir = 1 }, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "zl" = ( /obj/structure/shelf, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ @@ -394,78 +394,78 @@ pixel_y = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "zE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "zV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "AC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "AQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "AW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Bf" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Bj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "BI" = ( /obj/machinery/porta_turret/syndicate, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "BV" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Cd" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Ci" = ( /obj/structure/fluff/sat_dish, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "CL" = ( /obj/machinery/porta_turret/syndicate{ dir = 1 }, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "CY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "DA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -474,10 +474,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Ek" = ( /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "En" = ( /obj/structure/railing{ color = "#36373a"; @@ -491,15 +491,15 @@ /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Fy" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /obj/machinery/door/window/survival_pod/left/directional/west, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Gt" = ( /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Hp" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/reagent_containers/cup/glass/trophy{ @@ -515,61 +515,61 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_half, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "HE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "HL" = ( /obj/structure/cable, /obj/structure/sign/flag/tizira/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark/smooth_large, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "IA" = ( /obj/structure/railing{ color = "#36373a"; dir = 10 }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "KJ" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "KW" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Ln" = ( /obj/machinery/computer/shuttle/pirate{ dir = 1 }, /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Lo" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "LH" = ( /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "MW" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Nk" = ( /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Pd" = ( /obj/structure/shelf, /obj/item/grenade/firecracker{ @@ -600,31 +600,31 @@ pixel_x = 6 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Pk" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Pv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "PG" = ( /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Ql" = ( /obj/machinery/computer/monitor{ dir = 1 }, /obj/structure/cable, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Qu" = ( /obj/structure/girder/reinforced, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "QK" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 1; @@ -633,97 +633,97 @@ view_range = 10 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Re" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Rm" = ( /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "SH" = ( /obj/structure/railing{ color = "#36373a" }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Ta" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Tc" = ( /obj/machinery/space_heater, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Tf" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "To" = ( /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "TS" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "UY" = ( /obj/machinery/door/airlock/external, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Wd" = ( /obj/effect/turf_decal/tile/red/half{ dir = 1 }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "WO" = ( /obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Xu" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" }, /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "XB" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "XY" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/item/gun/ballistic/bolt_thrower, /obj/structure/guncase, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Yf" = ( /obj/machinery/atmospherics/components/tank/air{ dir = 1 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "YT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) "Zt" = ( /obj/structure/railing{ color = "#36373a"; @@ -735,7 +735,7 @@ /obj/structure/marker_beacon/burgundy, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_corner, -/area/space) +/area/shuttle/personally_bought/tiziran_corvette) (1,1,1) = {" xT diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index 61cf3cc1a4aa8e..c58fa93922f74c 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -1,134 +1,134 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, -/area/space) +/area/template_noop) "c" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "d" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "e" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "g" = ( /obj/structure/guncase, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/gun/ballistic/bolt_thrower, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "h" = ( /obj/machinery/power/micro_reactor, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "i" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "j" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "l" = ( /obj/structure/minecart_rail{ dir = 4 }, /turf/template_noop, -/area/space) +/area/template_noop) "n" = ( /obj/structure/closet/crate/secure/plasma, /obj/item/stack/sheet/mineral/plasma/five, /obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "r" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "s" = ( /obj/machinery/porta_turret/syndicate, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "u" = ( /obj/machinery/computer/shuttle/pirate{ dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "v" = ( /obj/structure/minecart_rail{ dir = 4 }, /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "z" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "A" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "B" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "H" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "I" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; suit_type = /obj/item/clothing/suit/space/pirate/tiziran }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "K" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "L" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "M" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "O" = ( /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "P" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -136,7 +136,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "Q" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -147,13 +147,13 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "R" = ( /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "S" = ( /turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "T" = ( /obj/structure/minecart_rail{ dir = 4 @@ -167,7 +167,7 @@ pixel_y = 5 }, /turf/template_noop, -/area/space) +/area/template_noop) "U" = ( /obj/machinery/computer/monitor{ dir = 8 @@ -182,7 +182,7 @@ pixel_x = -3 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "V" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" @@ -190,7 +190,7 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) (1,1,1) = {" K diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index 765b09bac57e2b..ed80bbcbb56fc2 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -96,7 +96,7 @@ "kC" = ( /obj/structure/minecart_rail, /turf/template_noop, -/area/space) +/area/template_noop) "lr" = ( /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, @@ -497,7 +497,7 @@ pixel_y = -14 }, /turf/template_noop, -/area/space) +/area/template_noop) "Fd" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 1 @@ -582,7 +582,7 @@ /area/space) "MZ" = ( /turf/template_noop, -/area/space) +/area/template_noop) "Nx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm index b0728675f2aeea..6b04f97d8b79d3 100644 --- a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -17,7 +17,7 @@ /datum/map_template/shuttle/personal_buyable/antagonist/tiziran_interceptor name = "ITF Zul'kath" - description = "A Tiziran warship built for high speed pursuits of lightly armed merchant farers." + description = "A Tiziran interceptor with a tandem cockpit that was originally developed for hyperspace interdiction." credit_cost = CARGO_CRATE_VALUE * 8 suffix = "tiziran_interceptor" width = 10 @@ -29,7 +29,9 @@ // datum for the pirate shuttle /datum/map_template/shuttle/pirate/tiziran_corvette - prefix = "_maps/shuttles/~doppler_shuttles/ + prefix = "_maps/shuttles/~doppler_shuttles/" suffix = "tiziran_raider_shuttle" name = "pirate ship (Tiziran Corvette)" +/area/shuttle/pirate/tiziran_corvette + name = "Tiziran corvette" diff --git a/tgstation.dme b/tgstation.dme index 1d0d6c39dde06f..36325b1ef63627 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7695,6 +7695,7 @@ #include "modular_doppler\ships_r_us\code\shuttle_lockers.dm" #include "modular_doppler\ships_r_us\code\shuttle_parts.dm" #include "modular_doppler\ships_r_us\code\wirefix.dm" +#include "modular_doppler\ships_r_us\code\shuttle_templates\antag_ships.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\big_boy.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\ferries.dm" #include "modular_doppler\ships_r_us\code\shuttle_templates\incomplete.dm" From 4507a34d3e28419272f108c2e3921ace3efd87c1 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 17 Dec 2025 01:34:58 -0800 Subject: [PATCH 12/38] tweaking interceptor forever until it works --- .../~doppler_shuttles/tiziran_interceptor.dmm | 109 +++++++++++++----- .../~doppler_defines/shuttle_defines.dm | 2 +- .../code/shuttle_templates/antag_ships.dm | 4 +- 3 files changed, 85 insertions(+), 30 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index c58fa93922f74c..bfc87eba3c654f 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -3,10 +3,9 @@ /turf/template_noop, /area/template_noop) "c" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "d" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ @@ -18,13 +17,21 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, +/obj/effect/landmark/ship_captain_spawner, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"f" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "g" = ( /obj/structure/guncase, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/gun/ballistic/bolt_thrower, +/obj/machinery/wall_healer/free/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "h" = ( @@ -42,6 +49,15 @@ "j" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/docking_port/mobile/personally_bought, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"k" = ( +/obj/structure/closet/firecloset/shuttle/tools, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "l" = ( @@ -59,6 +75,14 @@ "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) +"p" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interceptor" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "r" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 8 @@ -83,22 +107,46 @@ }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_interceptor) +"x" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "z" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "A" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "B" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) +"D" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"E" = ( +/obj/structure/closet/firecloset/shuttle, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/machinery/light/small/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"G" = ( +/obj/item/tether_anchor{ + anchored = 1 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "H" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -110,6 +158,11 @@ }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"J" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "K" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 @@ -120,10 +173,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "M" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "O" = ( @@ -133,8 +187,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "Q" = ( @@ -146,7 +199,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cell_10k, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "R" = ( /turf/open/floor/catwalk_floor/iron_dark/airless, @@ -176,8 +229,8 @@ pixel_y = -24 }, /obj/machinery/button/door{ - id = "silverbridge"; - name = "Window Shutters Control"; + id = "interceptor"; + name = "Cockpit Shutters Control"; pixel_y = -34; pixel_x = -3 }, @@ -203,21 +256,21 @@ K K "} (2,1,1) = {" -o -o +f +f B d R B -o -o +f +f "} (3,1,1) = {" o h o j -o +G o i o @@ -227,39 +280,39 @@ o A c L -H -H +J +D H o "} (5,1,1) = {" -o +G M n L -O +I O g -o +G "} (6,1,1) = {" v o -O -L +k +x P -I +E o S "} (7,1,1) = {" l -S +s o Q U o -S +s a "} (8,1,1) = {" @@ -268,7 +321,7 @@ a V z e -V +p a a "} diff --git a/code/__DEFINES/~doppler_defines/shuttle_defines.dm b/code/__DEFINES/~doppler_defines/shuttle_defines.dm index fa1742a2d6500d..9204720eb10b66 100644 --- a/code/__DEFINES/~doppler_defines/shuttle_defines.dm +++ b/code/__DEFINES/~doppler_defines/shuttle_defines.dm @@ -10,4 +10,4 @@ #define PERSONAL_SHIP_TYPE_MINING "Supply" #define PERSONAL_SHIP_TYPE_DIY "Incomplete" #define PERSONAL_SHIP_TYPE_POD "Pod" -#define PERSONAL_SHIP_TYPE_ANTAGONIST "Antagonist" +#define PERSONAL_SHIP_TYPE_ANTAGONIST "Illicit" diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm index 6b04f97d8b79d3..e0f4e3f362fd86 100644 --- a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -14,6 +14,7 @@ personal_shuttle_size = PERSONAL_SHIP_LARGE /area/shuttle/personally_bought/tiziran_corvette + name = "ITS Kaz'akran" /datum/map_template/shuttle/personal_buyable/antagonist/tiziran_interceptor name = "ITF Zul'kath" @@ -25,6 +26,7 @@ personal_shuttle_size = PERSONAL_SHIP_SMALL /area/shuttle/personally_bought/tiziran_interceptor + name = "ITF Zul'kath" // datum for the pirate shuttle @@ -34,4 +36,4 @@ name = "pirate ship (Tiziran Corvette)" /area/shuttle/pirate/tiziran_corvette - name = "Tiziran corvette" + name = "ITS Kaz'akran" From 2c5058a5b7257aa3f31ff48550f9f63967d8042b Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 17 Dec 2025 20:51:19 -0800 Subject: [PATCH 13/38] interceptor fixes --- .../~doppler_shuttles/tiziran_interceptor.dmm | 87 +++++++++++-------- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index bfc87eba3c654f..8f97ebd47c4dde 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -3,8 +3,13 @@ /turf/template_noop, /area/template_noop) "c" = ( -/obj/structure/cable, -/obj/machinery/light/small/red/directional/west, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "d" = ( @@ -35,8 +40,13 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "h" = ( -/obj/machinery/power/micro_reactor, -/obj/structure/cable, +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "i" = ( @@ -47,18 +57,19 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "j" = ( -/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/docking_port/mobile/personally_bought, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) "k" = ( -/obj/structure/closet/firecloset/shuttle/tools, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/machinery/light/small/red/directional/north, -/turf/open/floor/plating, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/fans/tiny, +/obj/docking_port/mobile/personally_bought{ + dir = 2; + port_direction = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "l" = ( /obj/structure/minecart_rail{ @@ -66,12 +77,6 @@ }, /turf/template_noop, /area/template_noop) -"n" = ( -/obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) @@ -84,10 +89,10 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "r" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ +/obj/structure/cable, +/obj/machinery/computer/camera_advanced/shuttle_docker/personally_bought{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "s" = ( @@ -95,11 +100,11 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_interceptor) "u" = ( -/obj/machinery/computer/shuttle/pirate{ +/obj/structure/cable, +/obj/machinery/computer/shuttle/personally_bought{ dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "v" = ( /obj/structure/minecart_rail{ @@ -112,6 +117,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/door/window/survival_pod/left/directional/west, +/obj/machinery/light/small/red/directional/north, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "z" = ( @@ -122,7 +128,8 @@ /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "A" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "B" = ( @@ -152,15 +159,15 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "I" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "J" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/red/directional/west, +/obj/machinery/door/window/survival_pod/left/directional/north, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "K" = ( @@ -176,11 +183,17 @@ /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "M" = ( -/obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/structure/cable, +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "O" = ( +/obj/structure/closet/firecloset/shuttle/tools, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "P" = ( @@ -222,9 +235,6 @@ /turf/template_noop, /area/template_noop) "U" = ( -/obj/machinery/computer/monitor{ - dir = 8 - }, /obj/machinery/turretid{ pixel_y = -24 }, @@ -234,6 +244,9 @@ pixel_y = -34; pixel_x = -3 }, +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "V" = ( @@ -276,7 +289,7 @@ i o "} (4,1,1) = {" -o +k A c L @@ -288,7 +301,7 @@ o (5,1,1) = {" G M -n +o L I O @@ -298,7 +311,7 @@ G (6,1,1) = {" v o -k +o x P E From 220e8c56295a8058c8d089225c37e84763abbbe6 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 22 Dec 2025 00:21:37 -0800 Subject: [PATCH 14/38] fixes, updates --- .../~doppler_shuttles/tiziran_corvette.dmm | 1812 +++++++--------- .../~doppler_shuttles/tiziran_interceptor.dmm | 153 +- .../tiziran_raider_shuttle.dmm | 1864 +++++++---------- .../modular_antagonists/cantina/spawners.dm | 2 + .../pirates/tiziran_raiders.dm | 1 + .../modular_weapons/code/guns/naval_gun.dm | 4 - .../code/shuttle_templates/antag_ships.dm | 10 +- 7 files changed, 1605 insertions(+), 2241 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index 166ebe4876fd02..02d25bce37f2d5 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -1,29 +1,78 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/structure/railing{ + color = "#36373a"; + dir = 10 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "af" = ( -/obj/structure/railing{ - color = "#36373a" +/obj/machinery/deployable_turret/snub_particle_cannon{ + pixel_y = -5 }, -/obj/effect/turf_decal/tile/red{ +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"aN" = ( +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"be" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"cb" = ( +/obj/structure/cable, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"dr" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, /turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"aN" = ( -/obj/effect/turf_decal/tile/red/half{ +/area/shuttle/personally_bought/tiziran_interceptor) +"dC" = ( +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"er" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"eI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"fc" = ( +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"fh" = ( +/obj/machinery/computer/monitor{ + dir = 1 }, -/area/shuttle/personally_bought/tiziran_corvette) -"be" = ( +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) +"fO" = ( /obj/machinery/turretid{ ailock = 1; desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; @@ -37,340 +86,199 @@ /obj/structure/cable, /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"cb" = ( -/obj/machinery/deployable_turret/snub_particle_cannon{ - pixel_y = -5 - }, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"dr" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"dC" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_corner{ +/area/shuttle/personally_bought/tiziran_interceptor) +"gi" = ( +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, -/area/shuttle/personally_bought/tiziran_corvette) -"er" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"eI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"fc" = ( -/obj/item/radio/intercom/syndicate/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_corvette) -"fh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"fO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"gi" = ( +/turf/open/floor/plating/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"gj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"gj" = ( -/obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "gp" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_corvette) -"gz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"gz" = ( +/obj/structure/railing/eva_handhold/directional/east, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) "gE" = ( -/obj/structure/shelf, -/obj/item/melee/tizirian_sword{ - pixel_x = -10 +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"hi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/obj/item/melee/tizirian_sword{ - pixel_x = -3 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ + pixel_x = -4; + pixel_y = 5 }, -/obj/item/melee/tizirian_sword{ - pixel_x = 5 +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 7; + pixel_y = 7 }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"gR" = ( +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"hq" = ( /obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow + helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"hi" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"hq" = ( -/obj/structure/minecart_rail, -/obj/structure/marker_beacon/burgundy{ - pixel_x = 6; - pixel_y = -14 - }, -/obj/structure/marker_beacon/olive{ - pixel_x = -6; - pixel_y = -14 - }, -/turf/template_noop, -/area/template_noop) +/area/shuttle/personally_bought/tiziran_interceptor) "hC" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_interceptor) "hQ" = ( -/obj/machinery/vending/imported/tiziran, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "ip" = ( -/obj/effect/turf_decal/tile/red/half{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "ju" = ( -/obj/structure/chair/plastic{ +/obj/machinery/computer/shuttle/pirate{ dir = 1 }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "jW" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "lg" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"lh" = ( -/obj/machinery/modular_computer/preset/engineering{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"mZ" = ( -/obj/structure/railing/eva_handhold/directional/west, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_corvette) -"nl" = ( +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"lh" = ( /obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"nm" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"nw" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_interceptor) +"mZ" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"nQ" = ( -/obj/machinery/power/micro_reactor, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"oo" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, +/area/shuttle/personally_bought/tiziran_interceptor) +"nl" = ( +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"nw" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"ot" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/half{ +/area/shuttle/personally_bought/tiziran_interceptor) +"oO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"oO" = ( -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "pb" = ( -/obj/item/rolling_table_dock, -/obj/effect/spawner/random/vendor_meal_sides/tizira, -/obj/item/reagent_containers/condiment/pack/ketchup{ - pixel_y = 7; - pixel_x = -9 +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "qv" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile/personally_bought{ + dir = 4 }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"rl" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"rn" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"rl" = ( -/obj/structure/chair/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"rn" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "rF" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile/personally_bought, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/chair/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_interceptor) "rH" = ( -/obj/structure/railing/eva_handhold/directional/east, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "rO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "sy" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"ua" = ( /obj/machinery/door/airlock/external, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"ua" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "uE" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/vending/imported/tiziran, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "uT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/curtain/bounty/start_closed, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "uV" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/fluff/sat_dish, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "uW" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/button/door{ - id = "silverbridge"; - name = "Window Shutters Control" - }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"vq" = ( -/obj/structure/railing/eva_handhold/directional/west, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) -"vS" = ( -/obj/structure/minecart_rail, -/turf/template_noop, -/area/template_noop) -"wi" = ( +/obj/item/radio/intercom/syndicate/directional/north, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_corvette) -"wt" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"vS" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"wu" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 8 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"wP" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red - }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"xc" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"xm" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"xT" = ( -/turf/template_noop, -/area/template_noop) -"ya" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"yQ" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"zl" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"wt" = ( /obj/structure/shelf, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ pixel_x = 2; @@ -394,238 +302,234 @@ pixel_y = 4 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"zE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/area/shuttle/personally_bought/tiziran_interceptor) +"wu" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"wP" = ( +/obj/structure/sign/poster/ripped/directional/west, +/obj/structure/bed/pod, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"xc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"xm" = ( +/obj/structure/shelf, +/obj/item/melee/tizirian_sword{ + pixel_x = -10 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = -3 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = 5 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"zV" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"xT" = ( +/turf/template_noop, +/area/template_noop) +"ya" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"AC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"yQ" = ( +/obj/structure/bed/pod, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"zl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"zV" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"AQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/area/shuttle/personally_bought/tiziran_interceptor) +"AC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"AQ" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "AW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"Bf" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "Bj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/structure/chair/plastic{ + dir = 4 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "BI" = ( -/obj/machinery/porta_turret/syndicate, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "BV" = ( -/obj/machinery/power/shuttle_engine/heater{ - dir = 1 +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) -"Cd" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Ci" = ( -/obj/structure/fluff/sat_dish, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"CL" = ( -/obj/machinery/porta_turret/syndicate{ +/obj/effect/turf_decal/tile/red/half{ dir = 1 }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) -"CY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) +"CL" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) +"CY" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "DA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/curtain/bounty/start_closed, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "Ek" = ( -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"En" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/obj/structure/marker_beacon/burgundy, +/obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"En" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control" }, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "Fy" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/door/window/survival_pod/left/directional/west, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Gt" = ( -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_corvette) -"Hp" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_y = 20; - pixel_x = -8 +/obj/structure/shelf, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 6 }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 8 }, -/obj/item/clothing/head/helmet/skull{ - pixel_x = 5; - pixel_y = -3 +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 10 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_corvette) -"HE" = ( +/obj/item/lighter/skull{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"Hp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"HL" = ( -/obj/structure/cable, -/obj/structure/sign/flag/tizira/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_corvette) -"IA" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"KJ" = ( -/obj/structure/girder/reinforced, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"KW" = ( -/obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/structure/cable, +/obj/machinery/door/airlock/hatch, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"Ln" = ( -/obj/machinery/computer/shuttle/pirate{ +/area/shuttle/personally_bought/tiziran_interceptor) +"HE" = ( +/obj/machinery/porta_turret/syndicate{ dir = 1 }, -/obj/effect/turf_decal/tile/red/full, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"IA" = ( +/obj/machinery/door/airlock/external, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"Lo" = ( -/obj/structure/chair/comfy/shuttle{ +/area/shuttle/personally_bought/tiziran_interceptor) +"KJ" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"Ln" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "LH" = ( +/obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "MW" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Nk" = ( -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) -"Pd" = ( -/obj/structure/shelf, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/lighter/skull{ - pixel_x = -6; - pixel_y = -8 - }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/grenade/firecracker{ - pixel_x = 6 - }, +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "Pk" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Pv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "PG" = ( -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Ql" = ( /obj/machinery/computer/monitor{ dir = 1 }, /obj/structure/cable, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "Qu" = ( -/obj/structure/girder/reinforced, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"QK" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 1; x_offset = 12; @@ -633,109 +537,84 @@ view_range = 10 }, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) +"QK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Re" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Rm" = ( -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "SH" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"Ta" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) +"Ta" = ( +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) "Tc" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"Tf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/structure/railing{ + color = "#36373a" }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "To" = ( -/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/area/shuttle/personally_bought/tiziran_interceptor) "TS" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_corvette) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "UY" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_corvette) -"Wd" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"WO" = ( -/obj/structure/chair/plastic{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"Xu" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"XB" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"WO" = ( /obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_corvette) -"XY" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) -"Yf" = ( -/obj/machinery/atmospherics/components/tank/air{ - dir = 1 +/area/shuttle/personally_bought/tiziran_interceptor) +"XB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "YT" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_corvette) -"Zt" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 6 +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 }, /obj/effect/turf_decal/tile/red/half{ - dir = 1 + dir = 4 }, -/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) +"Zt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_corner, -/area/shuttle/personally_bought/tiziran_corvette) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) (1,1,1) = {" xT @@ -745,22 +624,17 @@ xT xT xT xT +rl +qv +CL +ua +ua +nl xT xT -vq -rF -mZ -gp -gp -Gt -xT -xT -xT -Gt -gp -gp -BI -xT +nl +ua +Ta xT xT xT @@ -774,24 +648,19 @@ xT xT xT xT -xT -xT -Gt -gp -gz -gp -LH -LH -gp -Gt -Gt -Gt -gp -LH -KJ -gp -Gt -xT +nl +ua +oO +ua +To +To +ua +nl +nl +ua +To +ua +nl xT xT xT @@ -803,26 +672,21 @@ xT xT xT xT -xT -xT -Gt -gp -gp -jW -gp -nl nl -Bf +ua +ua +wu +ua zV -dr +zV +vS +xc +dC +To To LH -LH -LH -KJ -gp -Gt -xT +ua +nl xT xT xT @@ -832,28 +696,23 @@ xT xT xT xT -xT -xT -Gt -gp -PG -LH -AW -LH nl +ua +CY +To +rH +rH +zV +To +ua +Ln LH -gp -zE -LH -KJ -LH -LH -LH +To +To +To LH -KJ -gp -BI -xT +ua +Ta xT xT "} @@ -861,228 +720,63 @@ xT xT xT xT -xT -xT -Gt -gp -nl -nl -nl nl +ua +UY +zV +rH +rH +To +ua nl nl -LH -Xu -LH -KJ -KJ -KJ +ua +To To To LH -LH -KJ -gp -Gt -xT -xT -"} -(6,1,1) = {" -xT -xT -xT -xT -Gt -gp +To +To LH nl -LH -LH -LH -LH -gp -Gt -Gt -gp -LH -LH -LH -LH -KJ -KJ -LH -LH -KJ -gp -Gt xT "} -(7,1,1) = {" -xT -xT -xT -CL -gp -hQ -LH -HE -Bj -LH -LH -gp -Gt -xT -xT -Gt -gp -gp -gp -gp -gp -gp -gp -gp -gp -gp -gp -Gt -"} -(8,1,1) = {" -xT -uE -BV -gp -WO -LH -gi -HE -gp -gp -gp -BI -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -"} -(9,1,1) = {" -xT -uE -BV -Tc -pb -ju -gp -TS -gp -Ek -Ek -UY -IA -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT +(6,1,1) = {" xT xT -"} -(10,1,1) = {" -uE -BV -gp -gp -gp -gp -gp HE -gp ua -gp -Gt -cb -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -"} -(11,1,1) = {" uE -BV -Tf -oO -gp -Ta +AW +QK +To +To +ua nl -DA -uT -sy -Ql -ya -SH -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT xT xT +nl +ua +ua +ua +ua +ua +ua +ua +ua +nl +"} +(7,1,1) = {" xT -"} -(12,1,1) = {" -uE -BV -YT -rO -gp -Lo -nl -eI -ip -ot -lh -ya -Ek -xT -xT +gi +fc +Bj +To +AW +ua +ua +ua +Ta xT xT xT @@ -1097,23 +791,18 @@ xT xT xT "} -(13,1,1) = {" -Gt -gp -Cd -gp -gp +(8,1,1) = {" +xT +gi +fc gp -wt -Zt aN -ip -hC -ya -ya -xT -xT -xT +hQ +ua +jW +jW +sy +ab xT xT xT @@ -1127,23 +816,18 @@ xT xT xT "} -(14,1,1) = {" -Gt -Pv -YT -nm -AQ -gp -HL -Hp +(9,1,1) = {" +gi +fc +ua +ua +ua +Ek +ua +IA +ua +nl af -Wd -uW -rn -ya -xT -xT -xT xT xT xT @@ -1157,23 +841,18 @@ xT xT xT "} -(15,1,1) = {" -Gt -KW -YT -YT -YT -TS -wi -rl -lg -Rm -Re -Ln -ya -xT -xT -xT +(10,1,1) = {" +gi +fc +wP +yQ +ua +QK +Pk +cb +Ql +AC +Tc xT xT xT @@ -1187,23 +866,18 @@ xT xT xT "} -(16,1,1) = {" -Gt -gj -YT -nQ -nQ -gp +(11,1,1) = {" +gi fc -hi -yQ -Wd -XB +DA +uT +ua QK -ya -xT -xT -xT +gE +SH +YT +AC +AC xT xT xT @@ -1217,23 +891,18 @@ xT xT xT "} -(17,1,1) = {" -Gt -gp -Cd -gp -gp -gp +(12,1,1) = {" +xT nl +Zt +ip +ua +lh +dr +Ci En -dC -MW -wu -ya -ya -xT -xT -xT +fh +AC xT xT xT @@ -1247,19 +916,18 @@ xT xT xT "} -(18,1,1) = {" -uE -BV -YT -ab -oO -gp -AC -HE -MW -nw -qv +(13,1,1) = {" +xT +nl +Zt +Zt ya +hC +rF +PG +AQ +ju +AC xT xT xT @@ -1272,24 +940,22 @@ xT xT xT xT +"} +(14,1,1) = {" xT +nl +Hp +ua +ua +uW +rn +Ci +Pv +Qu +AC xT xT xT -"} -(19,1,1) = {" -uE -BV -CY -oO -oO -gp -fh -DA -sy -sy -be -ya xT xT xT @@ -1299,6 +965,19 @@ xT xT xT xT +"} +(15,1,1) = {" +gi +fc +Zt +lg +ua +Re +QK +mZ +WO +AC +AC xT xT xT @@ -1306,27 +985,23 @@ xT xT xT xT -"} -(20,1,1) = {" -uE -BV -gp -gp -gp -gp -gp -HE -Nk -Nk -gp -Gt -vS -hq xT xT xT xT xT +"} +(16,1,1) = {" +gi +fc +hi +yQ +ua +XB +QK +Pk +fO +AC xT xT xT @@ -1336,23 +1011,22 @@ xT xT xT xT -"} -(21,1,1) = {" xT -uE -BV -Yf -fO -LH -gp -TS -gp -gp -Gt -Ci xT xT xT +"} +(17,1,1) = {" +gi +fc +ua +ua +ua +ua +QK +Rm +ua +nl xT xT xT @@ -1367,19 +1041,17 @@ xT xT xT "} -(22,1,1) = {" +(18,1,1) = {" xT -uE -BV -gp -fO -fO -fO -HE -LH -gR -gp -BI +gi +fc +MW +nw +ua +ya +ua +nl +uV xT xT xT @@ -1393,214 +1065,176 @@ xT xT xT xT +"} +(19,1,1) = {" xT +gi +fc +be +be +be +QK +BV +ua +Ta xT xT -"} -(23,1,1) = {" xT xT xT -CL -gp -LH -LH -HE -Bj -LH -wP -gp -Gt xT xT -Gt -gp -gp -gp -gp -gp -gp -gp -gp -gp -gp -gp -Gt -"} -(24,1,1) = {" xT xT xT xT -Gt -gp -LH -nl -LH -LH -LH -oo -gp -Gt -Gt -gp -er -LH -LH -LH -KJ -LH -LH -LH -KJ -gp -Gt xT -"} -(25,1,1) = {" xT +"} +(20,1,1) = {" xT xT +HE +ua +Nk +To +QK +To +hq +ua +nl xT xT -Gt -gp -nl -nl -nl -nl nl +ua +ua +ua +ua +ua +ua +ua +ua nl +"} +(21,1,1) = {" +xT +xT +xT nl -Bf +ua +To +QK +hQ +hQ +pb +ua nl nl -dr -LH -LH -Qu -KJ +ua +eI +TS +eI +rO +To +To LH -KJ -gp -Gt -xT +nl xT "} -(26,1,1) = {" -xT -xT -xT +(22,1,1) = {" xT xT xT -Gt -gp -LH -zE -Fy -xm -xm -XY -gp -gp -jW -gp -KJ +nl +nl +ua +BI +Ln +hQ +hQ +hQ +hQ KJ -To +hQ +hQ +ua LH -KJ -gp -BI -xT +Ln +LH +ua +Ta xT xT "} -(27,1,1) = {" -xT -xT +(23,1,1) = {" xT xT xT xT xT +nl +ua +xm Gt -gp -LH -Pk -LH -LH -xc -gp -gi -AW -gp To +To +er +ua +gj +zl +ua +dC LH -LH -KJ -gp -Gt -xT +ua +nl xT xT xT "} -(28,1,1) = {" -xT -xT +(24,1,1) = {" xT xT xT xT xT xT +nl +ua +wt Gt -gp -gE -Pd -zl -xc -gp -rH -uV -rH -gp -LH -KJ -gp -Gt -xT +er +er +ua +gz +Fy +ua +To +ua +nl xT xT xT xT "} -(29,1,1) = {" -xT -xT -xT -xT +(25,1,1) = {" xT xT xT xT xT -Gt -gp -gp -gp -gp -Gt xT xT +nl +ua +ua +ua +ua +nl xT -Gt -gp -gp -BI xT +nl +ua +Ta xT xT xT diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index 8f97ebd47c4dde..46178d4d376968 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -10,13 +10,12 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "d" = ( -/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/obj/structure/railing/eva_handhold/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) "e" = ( /obj/structure/chair/comfy/shuttle{ @@ -36,7 +35,9 @@ /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/gun/ballistic/bolt_thrower, -/obj/machinery/wall_healer/free/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "h" = ( @@ -69,14 +70,18 @@ port_direction = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "l" = ( -/obj/structure/minecart_rail{ - dir = 4 - }, -/turf/template_noop, -/area/template_noop) +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/structure/closet/firecloset/shuttle, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"n" = ( +/obj/structure/railing/eva_handhold/directional/north, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) @@ -88,6 +93,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"q" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/wall_healer/free/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "r" = ( /obj/structure/cable, /obj/machinery/computer/camera_advanced/shuttle_docker/personally_bought{ @@ -99,18 +109,26 @@ /obj/machinery/porta_turret/syndicate, /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_interceptor) +"t" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "u" = ( /obj/structure/cable, /obj/machinery/computer/shuttle/personally_bought{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "v" = ( -/obj/structure/minecart_rail{ - dir = 4 +/obj/item/tether_anchor{ + anchored = 1 }, -/turf/closed/wall/mineral/plastitanium, +/obj/structure/railing/eva_handhold/directional/north, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) "x" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -118,34 +136,52 @@ /obj/structure/cable, /obj/machinery/door/window/survival_pod/left/directional/west, /obj/machinery/light/small/red/directional/north, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"y" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 4 + }, +/turf/open/floor/plating/airless, /area/shuttle/personally_bought/tiziran_interceptor) "z" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "A" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "B" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) +"C" = ( +/obj/structure/railing/eva_handhold/directional/south, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) "D" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "E" = ( -/obj/structure/closet/firecloset/shuttle, /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/machinery/light/small/red/directional/south, +/obj/structure/closet/crate/cardboard/tiziran, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, +/obj/item/reagent_containers/cup/soda_cans/doppler/kortara, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "G" = ( @@ -156,6 +192,8 @@ /area/shuttle/personally_bought/tiziran_interceptor) "H" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/poster/contraband/dolphin/directional/south, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "I" = ( @@ -167,7 +205,7 @@ "J" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/red/directional/west, -/obj/machinery/door/window/survival_pod/left/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "K" = ( @@ -180,7 +218,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "M" = ( /obj/machinery/suit_storage_unit/pirate{ @@ -194,6 +232,9 @@ /area/shuttle/personally_bought/tiziran_interceptor) "O" = ( /obj/structure/closet/firecloset/shuttle/tools, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "P" = ( @@ -212,28 +253,29 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cell_10k, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "R" = ( -/turf/open/floor/catwalk_floor/iron_dark/airless, +/obj/item/tether_anchor{ + anchored = 1 + }, +/obj/structure/railing/eva_handhold/directional/south, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) "S" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_interceptor) "T" = ( -/obj/structure/minecart_rail{ - dir = 4 - }, -/obj/structure/marker_beacon/burgundy{ - pixel_x = 16; - pixel_y = -7 +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/shelf, +/obj/item/melee/tizirian_sword{ + pixel_x = -3 }, -/obj/structure/marker_beacon/burgundy{ - pixel_x = 16; - pixel_y = 5 +/obj/item/melee/tizirian_sword{ + pixel_x = 5 }, -/turf/template_noop, -/area/template_noop) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "U" = ( /obj/machinery/turretid{ pixel_y = -24 @@ -257,10 +299,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"W" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) (1,1,1) = {" K -K +y a a a @@ -270,23 +319,23 @@ K "} (2,1,1) = {" f -f -B +t d -R +j +G B f f "} (3,1,1) = {" -o +n h o -j -G -o +q +T +l i -o +C "} (4,1,1) = {" k @@ -299,17 +348,17 @@ H o "} (5,1,1) = {" -G +v M o -L +W I O g -G +R "} (6,1,1) = {" -v +S o o x @@ -319,7 +368,7 @@ o S "} (7,1,1) = {" -l +a s o Q @@ -329,7 +378,7 @@ s a "} (8,1,1) = {" -T +a a V z diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index ed80bbcbb56fc2..e32a8261560099 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -1,186 +1,230 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ao" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/space) -"bn" = ( -/turf/closed/wall/mineral/plastitanium, -/area/space) -"cv" = ( /obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"cE" = ( -/obj/machinery/space_heater, /turf/open/floor/plating, -/area/space) -"do" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"bn" = ( +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) +"cv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"dO" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"cE" = ( +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile/pirate{ + dir = 4; + preferred_direction = 4; + port_direction = 4 }, -/turf/open/floor/iron/dark/smooth_corner{ +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"do" = ( +/obj/machinery/porta_turret/syndicate{ dir = 1 }, -/area/space) +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"dO" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "ee" = ( +/obj/structure/sign/poster/ripped/directional/west, +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"eq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/obj/structure/curtain/bounty/start_closed, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "ex" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control" }, -/area/space) +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "eY" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/turf/open/floor/plating, -/area/space) +/obj/structure/chair/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_interceptor) "fA" = ( +/obj/machinery/turretid{ + ailock = 1; + desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + icon_state = "control_kill"; + lethal = 1; + name = "Ship Turret Control"; + pixel_x = 30; + pixel_y = 4; + req_access = list("syndicate") + }, +/obj/machinery/shuttle_scrambler, /obj/structure/cable, -/obj/structure/sign/flag/tizira/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark/smooth_large, -/area/space) +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "fF" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 }, -/turf/open/floor/iron/dark/smooth_half, -/area/space) -"gG" = ( -/obj/machinery/door/airlock/external, /turf/open/floor/iron/dark/textured, -/area/space) -"ht" = ( -/obj/structure/railing/eva_handhold/directional/west, -/turf/closed/wall/mineral/plastitanium, -/area/space) -"iJ" = ( -/obj/structure/chair/plastic{ - dir = 1 - }, +/area/shuttle/personally_bought/tiziran_interceptor) +"gG" = ( +/obj/machinery/vending/imported/tiziran, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "jl" = ( -/obj/machinery/power/micro_reactor, -/turf/open/floor/iron/dark, -/area/space) +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "kd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/space) +/obj/machinery/door/airlock/external, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "kf" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/space) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "kC" = ( -/obj/structure/minecart_rail, -/turf/template_noop, -/area/template_noop) +/obj/machinery/computer/shuttle/pirate{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "lr" = ( -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/space) -"lS" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"lS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "lW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/structure/chair/plastic{ + dir = 4 }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "lY" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 6 +/obj/structure/shelf, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/lighter/skull{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6 }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"mJ" = ( +/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"mN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/marker_beacon/burgundy, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"nt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_corner, -/area/space) -"mJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"nD" = ( /obj/structure/railing{ color = "#36373a" }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) -"nt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/area/shuttle/personally_bought/tiziran_interceptor) +"og" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"nD" = ( -/obj/machinery/porta_turret/syndicate{ - dir = 1 - }, -/turf/closed/wall/mineral/plastitanium, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "oF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space) -"oS" = ( -/obj/machinery/vending/imported/tiziran, +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/guncase, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "pk" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile/pirate, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"pF" = ( -/obj/machinery/modular_computer/preset/engineering{ +/obj/effect/turf_decal/tile/red/half{ dir = 8 }, +/obj/machinery/loot_locator, /turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"pF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "pO" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"pW" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 }, /turf/open/floor/iron/dark, -/area/space) -"pW" = ( -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "qc" = ( -/obj/item/radio/intercom/syndicate/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/power/shuttle_engine/heater{ + dir = 1 }, -/turf/open/floor/iron/dark/smooth_large, -/area/space) -"qm" = ( +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"qp" = ( /obj/structure/shelf, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ pixel_x = 2; @@ -204,542 +248,421 @@ pixel_y = 4 }, /turf/open/floor/plating, -/area/space) -"qp" = ( -/obj/structure/girder/reinforced, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "qL" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, +/obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "rs" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "rA" = ( -/obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/space) -"sa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/space) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "te" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/button/door{ - id = "silverbridge"; - name = "Window Shutters Control" - }, -/turf/open/floor/iron/dark/textured, -/area/space) -"ti" = ( +/obj/item/radio/intercom/syndicate/directional/north, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"tX" = ( -/obj/machinery/power/shuttle_engine/heater{ - dir = 1 - }, -/turf/closed/wall/mineral/plastitanium, -/area/space) -"uo" = ( -/obj/effect/turf_decal/tile/red/half{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/space) -"vw" = ( -/obj/machinery/loot_locator, -/obj/effect/turf_decal/tile/red/half{ - dir = 8 +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_interceptor) +"tX" = ( +/obj/structure/fluff/sat_dish, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"uo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/micro_reactor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"vw" = ( +/obj/machinery/deployable_turret/snub_particle_cannon{ + pixel_y = -5 }, -/turf/open/floor/iron/dark/textured, -/area/space) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "vV" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 + }, /turf/open/floor/plating, -/area/space) -"wF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "wI" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_half, -/area/space) -"xm" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "xv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "xT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/space) -"yj" = ( -/obj/machinery/computer/shuttle/pirate{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/textured, -/area/space) -"yW" = ( /obj/structure/shelf, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/lighter/skull{ - pixel_x = -6; - pixel_y = -8 - }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -4 +/obj/item/melee/tizirian_sword{ + pixel_x = -10 }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -2 +/obj/item/melee/tizirian_sword{ + pixel_x = -3 }, -/obj/item/grenade/firecracker{ - pixel_x = 6 +/obj/item/melee/tizirian_sword{ + pixel_x = 5 }, /turf/open/floor/plating, -/area/space) -"zh" = ( -/obj/machinery/deployable_turret/snub_particle_cannon{ - pixel_y = -5 - }, +/area/shuttle/personally_bought/tiziran_interceptor) +"yj" = ( /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) -"zk" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"yW" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"zh" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "zv" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_y = 20; - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/obj/item/clothing/head/helmet/skull{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/space) -"zR" = ( -/obj/structure/chair/bronze, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/space) -"zT" = ( -/obj/structure/railing/eva_handhold/directional/east, -/turf/closed/wall/mineral/plastitanium, -/area/space) -"zX" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" +/obj/structure/chair/plastic{ + dir = 1 }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, /turf/open/floor/plating, -/area/space) -"Ag" = ( -/obj/machinery/power/shuttle_engine/propulsion{ +/area/shuttle/personally_bought/tiziran_interceptor) +"zR" = ( +/obj/machinery/computer/monitor{ dir = 1 }, -/turf/open/floor/plating/airless, -/area/space) -"At" = ( -/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) +"zX" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "AC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/space) +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "AT" = ( -/obj/structure/cable, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_large, -/area/space) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Ba" = ( -/turf/open/floor/iron/dark, -/area/space) -"Bf" = ( -/obj/machinery/porta_turret/syndicate, -/turf/closed/wall/mineral/plastitanium, -/area/space) -"Bi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/structure/railing{ + color = "#36373a"; + dir = 10 }, -/turf/open/floor/iron/dark, -/area/space) -"Bm" = ( -/obj/structure/girder/reinforced, -/turf/open/floor/plating, -/area/space) -"BS" = ( +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) +"Bf" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow }, /turf/open/floor/plating, -/area/space) -"Cm" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 1 - }, -/obj/structure/marker_beacon/burgundy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 +/area/shuttle/personally_bought/tiziran_interceptor) +"Bi" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 1; + x_offset = 12; + y_offset = 5; + view_range = 10 }, -/area/space) +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) +"BS" = ( +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) "Dl" = ( -/obj/structure/fluff/sat_dish, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Dp" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"Dv" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"DH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"Em" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 }, -/turf/open/floor/iron/dark, -/area/space) -"Dv" = ( -/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ - dir = 8 + dir = 4 }, -/turf/open/floor/iron/dark, -/area/space) -"DB" = ( -/obj/machinery/atmospherics/components/tank/air{ - dir = 1 +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 }, -/turf/open/floor/plating, -/area/space) -"Em" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"Eq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_interceptor) +"EI" = ( /obj/machinery/suit_storage_unit/pirate{ helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red }, /turf/open/floor/plating, -/area/space) -"EI" = ( -/obj/structure/minecart_rail, -/obj/structure/marker_beacon/burgundy{ - pixel_x = 6; - pixel_y = -14 - }, -/obj/structure/marker_beacon/olive{ - pixel_x = -6; - pixel_y = -14 - }, -/turf/template_noop, -/area/template_noop) -"Fd" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "FQ" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"GE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/space) +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "GI" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space) +/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "Id" = ( -/obj/effect/turf_decal/tile/red/half{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/space) +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 7; + pixel_y = 7 + }, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "In" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Is" = ( -/obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma/five, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/curtain/bounty/start_closed, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "IB" = ( -/obj/item/rolling_table_dock, -/obj/effect/spawner/random/vendor_meal_sides/tizira, -/obj/item/reagent_containers/condiment/pack/ketchup{ - pixel_y = 7; - pixel_x = -9 +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; + suit_type = /obj/item/clothing/suit/space/pirate/tiziran }, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"IN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "IS" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/space) +/turf/open/floor/plating/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "Ja" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) -"Je" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_interceptor) +"Jc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/space) -"JM" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"Je" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "JW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"LG" = ( +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"LG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "LS" = ( -/obj/machinery/computer/monitor{ - dir = 1 +/obj/effect/turf_decal/tile/red/half{ + dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/space) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_interceptor) +"Mp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "MZ" = ( /turf/template_noop, /area/template_noop) "Nx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"OC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/space) -"QC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) +"NK" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"QC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"Ra" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_interceptor) "Rf" = ( -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"RO" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, /turf/open/floor/plating, -/area/space) -"Sf" = ( -/obj/structure/tank_dispenser/oxygen, +/area/shuttle/personally_bought/tiziran_interceptor) +"RO" = ( +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "SA" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark, -/area/space) -"SG" = ( -/obj/machinery/turretid{ - ailock = 1; - desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; - lethal = 1; - name = "Ship Turret Control"; - pixel_x = 30; - pixel_y = 4; - req_access = list("syndicate") - }, -/obj/machinery/shuttle_scrambler, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/space) +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"SG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "SI" = ( /obj/structure/railing/eva_handhold/directional/west, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/space) +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) "Ti" = ( -/obj/structure/cable, +/obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) -"Tl" = ( +/area/shuttle/personally_bought/tiziran_interceptor) +"Tv" = ( /obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/space) -"Tu" = ( -/obj/structure/shelf, -/obj/item/melee/tizirian_sword{ - pixel_x = -10 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = -3 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = 5 - }, -/turf/open/floor/plating, -/area/space) -"Tv" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/space) +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_interceptor) "TK" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) "Un" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured, -/area/space) -"Vi" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, /obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/space) -"VR" = ( -/obj/machinery/door/airlock/hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_interceptor) +"Vi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "VT" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ - dir = 1; - x_offset = 12; - y_offset = 5; - view_range = 10 - }, -/turf/open/floor/iron/dark/textured, -/area/space) +/obj/structure/cable, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "VY" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) +"Xj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/hatch, /turf/open/floor/iron/dark, -/area/space) -"WA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "Xw" = ( -/obj/structure/chair/comfy/shuttle{ +/obj/structure/railing/eva_handhold/directional/east, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_interceptor) +"XN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/space) -"XN" = ( -/obj/structure/cable, /turf/open/floor/plating, -/area/space) +/area/shuttle/personally_bought/tiziran_interceptor) "Yq" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/door/window/survival_pod/left/directional/west, -/turf/open/floor/plating, -/area/space) -"YF" = ( -/obj/structure/railing{ - color = "#36373a" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/turf/open/floor/iron/dark/smooth_half, -/area/space) +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"ZK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) -(1,1,1) = {" -MZ -MZ +(1,1,1) = {" MZ MZ MZ @@ -747,20 +670,17 @@ MZ MZ MZ MZ -ht -pk SI -In -In +cE bn +Ja +Ja +BS MZ MZ -MZ -bn -In -In -Bf -MZ +BS +Ja +TK MZ MZ MZ @@ -774,24 +694,19 @@ MZ MZ MZ MZ -MZ -MZ -bn -In -nt -In -LG +BS +Ja LG +Ja In -bn -bn -bn In -LG -Bm +Ja +BS +BS +Ja In -bn -MZ +Ja +BS MZ MZ MZ @@ -803,26 +718,21 @@ MZ MZ MZ MZ -MZ -MZ -bn -In -In -cv -In -Ti +BS +Ja +Ja Ti -rs -Tl -XN +Ja +Dl +Dl lr -LG -LG -LG -Bm +Dp +RO In -bn -MZ +In +FQ +Ja +BS MZ MZ MZ @@ -832,197 +742,87 @@ MZ MZ MZ MZ -MZ -MZ -bn +BS +Ja +JW In -Sf -LG -Em -LG -Ti -LG +ZK +ZK +Dl In -xT -LG -Bm -LG -LG -LG -LG -Bm +Ja +XN +FQ In -Bf -MZ -MZ -MZ -"} -(5,1,1) = {" -MZ -MZ -MZ -MZ -MZ -bn In -Ti -Ti -Ti -Ti -Ti -Ti -LG -AC -LG -Bm -Bm -Bm -lr -lr -LG -LG -Bm In -bn +FQ +Ja +TK MZ MZ "} -(6,1,1) = {" -MZ +(5,1,1) = {" MZ MZ MZ -bn -In -LG -Ti -LG -LG -LG -LG +BS +Ja +Jc +Dl +ZK +ZK In -bn -bn +Ja +BS +BS +Ja +rs In -LG -LG -LG -LG -Bm -Bm -LG -LG -Bm In -bn -MZ -"} -(7,1,1) = {" -MZ -MZ -MZ -nD +FQ In -oS -LG -ee -lW -LG -LG In -bn -MZ +Ja +BS MZ -bn -In -In -In -In -In -In -In -In -In -In -In -bn "} -(8,1,1) = {" -MZ -Ag -tX -In -GI -LG -WA -ee -In -In -In -Bf -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ +(6,1,1) = {" MZ -"} -(9,1,1) = {" MZ -Ag -tX -cE -IB -iJ +do +Ja +gG +nt +Vi In -VR In -pW -pW Ja -Je -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ -MZ +BS MZ MZ +BS +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +BS "} -(10,1,1) = {" -Ag -tX -In -In -In -In -In -ee -In -gG -In -bn -zh -MZ +(7,1,1) = {" MZ +IS +qc +lW +In +nt +Ja +Ja +Ja +TK MZ MZ MZ @@ -1037,23 +837,18 @@ MZ MZ MZ "} -(11,1,1) = {" -Ag -tX -qL -Ba -In -IS -Ti -xv -do -lS -Vi -zX -mJ -MZ -MZ +(8,1,1) = {" MZ +IS +qc +vV +zv +SG +Ja +yj +yj +kd +Ba MZ MZ MZ @@ -1067,23 +862,18 @@ MZ MZ MZ "} -(12,1,1) = {" -Ag -tX -QC -sa -In -Xw -Ti -Nx -VY -xm -Tv -zX -pW -MZ -MZ -MZ +(9,1,1) = {" +IS +qc +Ja +Ja +Ja +GI +Ja +Je +Ja +BS +vw MZ MZ MZ @@ -1097,23 +887,18 @@ MZ MZ MZ "} -(13,1,1) = {" -bn -In -FQ -In -In -In -ti -lY -ex -VY -Un -zX -zX -MZ -MZ -MZ +(10,1,1) = {" +IS +qc +ee +NK +Ja +Vi +zh +VT +Ra +QC +nD MZ MZ MZ @@ -1127,23 +912,18 @@ MZ MZ MZ "} -(14,1,1) = {" -bn -ao +(11,1,1) = {" +IS +qc +eq +Is +Ja +og +yW +mJ +AC +QC QC -pO -OC -In -fA -zv -YF -zk -te -LS -zX -MZ -MZ -MZ MZ MZ MZ @@ -1157,23 +937,18 @@ MZ MZ MZ "} -(15,1,1) = {" -bn -rA -QC -QC -QC -VR -AT -zR -wI -At -SA -yj -zX -MZ -MZ +(12,1,1) = {" MZ +BS +IN +kf +Ja +Tv +Em +pW +ex +zR +QC MZ MZ MZ @@ -1187,23 +962,18 @@ MZ MZ MZ "} -(16,1,1) = {" -bn -Is -QC -jl -jl -In -qc -Id -fF -zk -pF -VT -zX -MZ -MZ +(13,1,1) = {" MZ +BS +Nx +Nx +VY +Un +eY +qL +xv +kC +QC MZ MZ MZ @@ -1217,23 +987,18 @@ MZ MZ MZ "} -(17,1,1) = {" -bn -In -FQ -In -In -In -Ti -Cm -dO -uo -vw -zX -zX -MZ -MZ +(14,1,1) = {" MZ +BS +Xj +Ja +Ja +te +LS +pW +fF +Bi +QC MZ MZ MZ @@ -1247,23 +1012,18 @@ MZ MZ MZ "} -(18,1,1) = {" -Ag -tX -QC -Dp -Ba -In -JW -ee -uo -Dv -Fd +(15,1,1) = {" +IS +qc +Nx +cv +Ja +SA +Vi zX -MZ -MZ -MZ -MZ +pk +QC +QC MZ MZ MZ @@ -1277,22 +1037,17 @@ MZ MZ MZ "} -(19,1,1) = {" -Ag -tX -Bi -Ba -Ba -In -wF -xv -lS -lS -SG -zX -MZ -MZ -MZ +(16,1,1) = {" +IS +qc +Id +wI +Ja +pF +Vi +zh +fA +QC MZ MZ MZ @@ -1307,22 +1062,17 @@ MZ MZ MZ "} -(20,1,1) = {" -Ag -tX -In -In -In -In -In -ee -Rf -Rf -In -bn -kC -EI -MZ +(17,1,1) = {" +IS +qc +Ja +Ja +Ja +Ja +Vi +jl +Ja +BS MZ MZ MZ @@ -1337,22 +1087,17 @@ MZ MZ MZ "} -(21,1,1) = {" +(18,1,1) = {" MZ -Ag +IS +qc +uo +Dv +Ja +VY +Ja +BS tX -DB -kd -LG -In -VR -In -In -bn -Dl -MZ -MZ -MZ MZ MZ MZ @@ -1367,22 +1112,17 @@ MZ MZ MZ "} -(22,1,1) = {" +(19,1,1) = {" MZ -Ag -tX -In -kd -kd -kd -ee -LG -BS -In +IS +qc +lS +lS +Mp +Vi Bf -MZ -MZ -MZ +Ja +TK MZ MZ MZ @@ -1397,210 +1137,150 @@ MZ MZ MZ "} -(23,1,1) = {" -MZ +(20,1,1) = {" MZ MZ -nD +do +Ja +Rf In -LG -LG -ee -lW -LG -Eq +Vi In -bn +EI +Ja +BS MZ MZ -bn -In -In -In -In -In -In -In -In -In -In -In -bn +BS +Ja +Ja +Ja +Ja +Ja +Ja +Ja +Ja +BS "} -(24,1,1) = {" -MZ +(21,1,1) = {" MZ MZ MZ -bn -In -LG -Ti -LG -LG -LG -kf +BS +Ja In -bn -bn +Vi +SG +SG +IB +Ja +BS +BS +Ja +rA +ao +rA +mN In -oF -LG -LG -LG -Bm -LG -LG -LG -Bm In -bn +Ja +BS MZ "} -(25,1,1) = {" -MZ -MZ +(22,1,1) = {" MZ MZ MZ -bn -In -Ti -Ti -Ti -Ti -Ti -Ti -Ti -rs -Ti -Ti +BS +BS +Ja +Yq XN -LG -LG -qp -Bm -LG -Bm -In -bn +SG +SG +SG +SG +AT +GE +SG +Ja +FQ +XN +FQ +Ja +TK MZ MZ "} -(26,1,1) = {" -MZ +(23,1,1) = {" MZ MZ MZ MZ MZ -bn -In -LG +BS +Ja xT -Yq -vV -vV -RO -In -In -cv -In -Bm -Bm -lr -LG -Bm -In -Bf -MZ -MZ -MZ -"} -(27,1,1) = {" -MZ -MZ -MZ -MZ -MZ -MZ -MZ -bn -In -LG -eY -LG -LG -JM -In -WA -Em +lY In -lr -LG -LG -Bm In -bn -MZ +oF +Ja +pO +DH +Ja +RO +FQ +Ja +BS MZ MZ MZ "} -(28,1,1) = {" -MZ -MZ +(24,1,1) = {" MZ MZ MZ MZ MZ MZ -bn -In -Tu -yW -qm -JM -In -zT -TK -zT -In -LG -Bm +BS +Ja +qp +lY +oF +oF +Ja +Xw +dO +Ja In -bn -MZ +Ja +BS MZ MZ MZ MZ "} -(29,1,1) = {" -MZ -MZ -MZ -MZ +(25,1,1) = {" MZ MZ MZ MZ MZ -bn -In -In -In -In -bn MZ MZ +BS +Ja +Ja +Ja +Ja +BS MZ -bn -In -In -Bf MZ +BS +Ja +TK MZ MZ MZ diff --git a/modular_doppler/modular_antagonists/cantina/spawners.dm b/modular_doppler/modular_antagonists/cantina/spawners.dm index 70f9dc21b8dc45..f1dd62244f4b05 100644 --- a/modular_doppler/modular_antagonists/cantina/spawners.dm +++ b/modular_doppler/modular_antagonists/cantina/spawners.dm @@ -19,6 +19,7 @@ var/mob/living/spawned_mob = . if(istype(spawned_mob)) spawned_mob.mind.add_antag_datum(/datum/antagonist/traitor/cantina_regular) + spawned_mob.faction = list(ROLE_SYNDICATE) /obj/effect/mob_spawn/ghost_role/human/cantina/special(mob/living/new_spawn) . = ..() @@ -45,6 +46,7 @@ var/mob/living/spawned_mob = . if(istype(spawned_mob)) spawned_mob.mind.add_antag_datum(/datum/antagonist/traitor/cantina_bartender) + spawned_mob.faction = list(ROLE_SYNDICATE) /obj/effect/mob_spawn/ghost_role/human/cantina_bartender/special(mob/living/new_spawn) . = ..() diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index 4206f12260ce80..a2374b9cc4278e 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -35,6 +35,7 @@ prompt_name = "Tiziran raider" outfit = /datum/outfit/pirate/tiziran rank = "swabbie" + icon_state = "oldpod" /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain name = "\improper Tiziran command sleeper" diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index c5efbae00aed5f..59da8d5c102263 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -24,10 +24,6 @@ . = ..() use_energy(power_draw_per_shot) -//we don't want it to spin like the parent turret can, so we override this behavior. -/obj/machinery/deployable_turret/snub_particle_cannon/direction_track(mob/user, atom/targeted) - return - /obj/projectile/energy/snub_particle_cannon_bolt name = "energized particle bolt" icon = 'modular_doppler/modular_weapons/icons/projectiles.dmi' diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm index e0f4e3f362fd86..7ab33be9e87139 100644 --- a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -2,13 +2,13 @@ /datum/map_template/shuttle/personal_buyable/antagonist personal_shuttle_type = PERSONAL_SHIP_TYPE_ANTAGONIST - port_id = "REDACTED" + port_id = "tiziran" /datum/map_template/shuttle/personal_buyable/antagonist/tiziran_corvette name = "ITS Kaz'akran" description = "A Tiziran warship built for high speed pursuits of lightly armed merchant farers." credit_cost = CARGO_CRATE_VALUE * 18 - suffix = "tiziran_corvette" + suffix = "corvette" width = 29 height = 28 personal_shuttle_size = PERSONAL_SHIP_LARGE @@ -20,20 +20,22 @@ name = "ITF Zul'kath" description = "A Tiziran interceptor with a tandem cockpit that was originally developed for hyperspace interdiction." credit_cost = CARGO_CRATE_VALUE * 8 - suffix = "tiziran_interceptor" + suffix = "interceptor" width = 10 height = 8 personal_shuttle_size = PERSONAL_SHIP_SMALL /area/shuttle/personally_bought/tiziran_interceptor name = "ITF Zul'kath" + requires_power = TRUE // datum for the pirate shuttle /datum/map_template/shuttle/pirate/tiziran_corvette prefix = "_maps/shuttles/~doppler_shuttles/" - suffix = "tiziran_raider_shuttle" + suffix = "raider_shuttle" name = "pirate ship (Tiziran Corvette)" /area/shuttle/pirate/tiziran_corvette name = "ITS Kaz'akran" + requires_power = TRUE From b562494c631052ba454383f732f5b191e47250dc Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 28 Dec 2025 13:14:21 -0800 Subject: [PATCH 15/38] map tweaks --- .../~doppler_shuttles/tiziran_corvette.dmm | 113 ++++++++++++++---- .../~doppler_shuttles/tiziran_interceptor.dmm | 24 ++-- .../tiziran_raider_shuttle.dmm | 98 +++++++++++---- .../pirates/tiziran_raiders.dm | 14 +++ tgstation.dme | 1 + 5 files changed, 183 insertions(+), 67 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index 02d25bce37f2d5..b055095a9b4b7d 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -4,12 +4,14 @@ color = "#36373a"; dir = 10 }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "af" = ( /obj/machinery/deployable_turret/snub_particle_cannon{ pixel_y = -5 }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "aN" = ( @@ -52,7 +54,7 @@ /area/shuttle/personally_bought/tiziran_interceptor) "er" = ( /obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, +/obj/structure/shelf, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "eI" = ( @@ -75,7 +77,7 @@ "fO" = ( /obj/machinery/turretid{ ailock = 1; - desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; @@ -85,6 +87,7 @@ }, /obj/structure/cable, /obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "gi" = ( @@ -126,13 +129,11 @@ pixel_x = 7; pixel_y = 7 }, +/obj/machinery/light/red/directional/east, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "hq" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red - }, +/obj/machinery/suit_storage_unit/tiziran_raiders/red, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "hC" = ( @@ -147,20 +148,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) +"ia" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "ip" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) +"iY" = ( +/obj/machinery/light/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "ju" = ( /obj/machinery/computer/shuttle/pirate{ dir = 1 }, /obj/effect/turf_decal/tile/red/full, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "jW" = ( +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "lg" = ( @@ -200,10 +213,7 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "pb" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, +/obj/machinery/suit_storage_unit/tiziran_raiders, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "qv" = ( @@ -239,17 +249,25 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/machinery/light/red/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "sy" = ( /obj/machinery/door/airlock/external, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "ua" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) +"ut" = ( +/obj/structure/cable, +/obj/machinery/light/red/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "uE" = ( /obj/machinery/vending/imported/tiziran, +/obj/machinery/light/red/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "uT" = ( @@ -272,6 +290,11 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/personally_bought/tiziran_interceptor) +"vJ" = ( +/obj/structure/bed/pod, +/obj/structure/sign/poster/contraband/lizard/directional/south, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "vS" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, @@ -301,6 +324,7 @@ pixel_x = -8; pixel_y = 4 }, +/obj/machinery/light/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "wu" = ( @@ -311,6 +335,7 @@ "wP" = ( /obj/structure/sign/poster/ripped/directional/west, /obj/structure/bed/pod, +/obj/machinery/light/red/directional/west, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "xc" = ( @@ -379,6 +404,7 @@ /obj/structure/chair/plastic{ dir = 4 }, +/obj/structure/sign/poster/contraband/dolphin/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "BI" = ( @@ -388,10 +414,7 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "BV" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow - }, +/obj/machinery/suit_storage_unit/tiziran_raiders/yellow, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "Ci" = ( @@ -400,6 +423,13 @@ }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) +"CB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "CL" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -427,6 +457,7 @@ id = "silverbridge"; name = "Window Shutters Control" }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "Fy" = ( @@ -464,6 +495,10 @@ }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"Ho" = ( +/obj/machinery/light/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Hp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -479,6 +514,7 @@ /area/shuttle/personally_bought/tiziran_interceptor) "IA" = ( /obj/machinery/door/airlock/external, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "KJ" = ( @@ -506,6 +542,14 @@ "Nk" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, +/obj/machinery/light/red/directional/east, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"NP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/red/directional/north, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "Pk" = ( @@ -516,17 +560,25 @@ /obj/machinery/modular_computer/preset/engineering{ dir = 8 }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "PG" = ( /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) +"PP" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/shelf, +/obj/machinery/light/red/directional/east, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Ql" = ( /obj/machinery/computer/monitor{ dir = 1 }, /obj/structure/cable, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "Qu" = ( @@ -553,6 +605,15 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) +"Ry" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cell_10k, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "SH" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ @@ -699,13 +760,13 @@ xT nl ua CY -To +iY rH rH zV -To +Ho ua -Ln +NP LH To To @@ -737,7 +798,7 @@ To LH To To -LH +ua nl xT "} @@ -799,7 +860,7 @@ gp aN hQ ua -jW +ut jW sy ab @@ -845,7 +906,7 @@ xT gi fc wP -yQ +vJ ua QK Pk @@ -872,7 +933,7 @@ fc DA uT ua -QK +Ry gE SH YT @@ -919,7 +980,7 @@ xT (13,1,1) = {" xT nl -Zt +CB Zt ya hC @@ -1137,7 +1198,7 @@ eI rO To To -LH +ua nl xT "} @@ -1145,7 +1206,7 @@ xT xT xT xT -nl +xT nl ua BI @@ -1156,7 +1217,7 @@ hQ hQ KJ hQ -hQ +ia ua LH Ln @@ -1203,7 +1264,7 @@ ua wt Gt er -er +PP ua gz Fy diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index 46178d4d376968..26f82ea0975f69 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -31,23 +31,20 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) "g" = ( -/obj/structure/guncase, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, /obj/item/gun/ballistic/bolt_thrower, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/shelf, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "h" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/machinery/suit_storage_unit/tiziran_raiders/red, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "i" = ( @@ -55,6 +52,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 4 }, +/obj/machinery/light/small/red/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "j" = ( @@ -103,6 +101,7 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/personally_bought{ dir = 8 }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "s" = ( @@ -202,12 +201,6 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) -"J" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/small/red/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "K" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 @@ -221,13 +214,11 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "M" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/machinery/suit_storage_unit/tiziran_raiders, +/obj/machinery/light/small/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "O" = ( @@ -289,6 +280,7 @@ /obj/machinery/modular_computer/preset/engineering{ dir = 8 }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "V" = ( @@ -342,7 +334,7 @@ k A c L -J +D D H o diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index e32a8261560099..8af28ecf8ce5a8 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -39,6 +39,7 @@ "ee" = ( /obj/structure/sign/poster/ripped/directional/west, /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, +/obj/machinery/light/red/directional/west, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "eq" = ( @@ -54,6 +55,7 @@ id = "silverbridge"; name = "Window Shutters Control" }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "eY" = ( @@ -63,9 +65,11 @@ /turf/open/floor/iron/dark/smooth_half, /area/shuttle/personally_bought/tiziran_interceptor) "fA" = ( +/obj/machinery/shuttle_scrambler, +/obj/structure/cable, /obj/machinery/turretid{ ailock = 1; - desc = d"A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; @@ -73,18 +77,25 @@ pixel_y = 4; req_access = list("syndicate") }, -/obj/machinery/shuttle_scrambler, -/obj/structure/cable, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "fF" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 8 }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) +"fI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_interceptor) "gG" = ( /obj/machinery/vending/imported/tiziran, +/obj/machinery/light/red/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "jl" = ( @@ -93,6 +104,7 @@ /area/shuttle/personally_bought/tiziran_interceptor) "kd" = ( /obj/machinery/door/airlock/external, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "kf" = ( @@ -106,6 +118,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/red/full, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "lr" = ( @@ -123,6 +136,7 @@ /obj/structure/chair/plastic{ dir = 4 }, +/obj/structure/sign/poster/contraband/dolphin/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "lY" = ( @@ -168,6 +182,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/machinery/light/red/directional/west, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "nt" = ( @@ -192,7 +207,8 @@ /area/shuttle/personally_bought/tiziran_interceptor) "oF" = ( /obj/item/gun/ballistic/bolt_thrower, -/obj/structure/guncase, +/obj/structure/shelf, +/obj/machinery/light/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "pk" = ( @@ -247,6 +263,7 @@ pixel_x = -8; pixel_y = 4 }, +/obj/machinery/light/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "qL" = ( @@ -286,6 +303,7 @@ /obj/machinery/deployable_turret/snub_particle_cannon{ pixel_y = -5 }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "vV" = ( @@ -320,6 +338,7 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "yj" = ( +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "yW" = ( @@ -348,6 +367,17 @@ }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) +"An" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/red/directional/north, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"Av" = ( +/obj/machinery/light/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "AC" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 1 @@ -368,13 +398,11 @@ color = "#36373a"; dir = 10 }, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) "Bf" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow - }, +/obj/machinery/suit_storage_unit/tiziran_raiders/yellow, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "Bi" = ( @@ -430,11 +458,15 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/shuttle/personally_bought/tiziran_interceptor) +"Ez" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "EI" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clotshing/head/helmet/space/obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red - }, +/obj/machinery/suit_storage_unit/tiziran_raiders/red, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "FQ" = ( @@ -467,6 +499,7 @@ pixel_x = 7; pixel_y = 7 }, +/obj/machinery/light/red/directional/east, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "In" = ( @@ -480,10 +513,7 @@ /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "IB" = ( -/obj/machinery/suit_storage_unit/pirate{ - helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider; - suit_type = /obj/item/clothing/suit/space/pirate/tiziran - }, +/obj/machinery/suit_storage_unit/tiziran_raiders, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "IN" = ( @@ -513,6 +543,7 @@ /area/shuttle/personally_bought/tiziran_interceptor) "Je" = ( /obj/machinery/door/airlock/external, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "JW" = ( @@ -550,8 +581,13 @@ /area/shuttle/personally_bought/tiziran_interceptor) "NK" = ( /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, +/obj/structure/sign/poster/contraband/lizard/directional/south, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) +"PT" = ( +/obj/machinery/light/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "QC" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" @@ -565,11 +601,13 @@ dir = 1 }, /obj/structure/cable, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_interceptor) "Rf" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, +/obj/machinery/light/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "RO" = ( @@ -592,6 +630,11 @@ /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_interceptor) +"SU" = ( +/obj/structure/cable, +/obj/machinery/light/red/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_interceptor) "Ti" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -651,6 +694,11 @@ }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"Yl" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/shelf, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "Yq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -745,13 +793,13 @@ MZ BS Ja JW -In +PT ZK ZK Dl -In +Av Ja -XN +An FQ In In @@ -845,7 +893,7 @@ vV zv SG Ja -yj +SU yj kd Ba @@ -965,7 +1013,7 @@ MZ (13,1,1) = {" MZ BS -Nx +Ez Nx VY Un @@ -1191,7 +1239,7 @@ MZ MZ MZ MZ -BS +MZ BS Ja Yq @@ -1202,7 +1250,7 @@ SG SG AT GE -SG +fI Ja FQ XN @@ -1224,7 +1272,7 @@ xT lY In In -oF +Yl Ja pO DH @@ -1248,7 +1296,7 @@ BS Ja qp lY -oF +Yl oF Ja Xw diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index a2374b9cc4278e..c8c095909b6c8b 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -40,3 +40,17 @@ /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain name = "\improper Tiziran command sleeper" rank = "captain" + +/obj/machinery/suit_storage_unit/tiziran_raiders + suit_type = /obj/item/clothing/suit/space/pirate/tiziran + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/jetpack/oxygen/harness + +/obj/machinery/suit_storage_unit/tiziran_raiders/red + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/red + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red + +/obj/machinery/suit_storage_unit/tiziran_raiders/yellow + suit_type = /obj/item/clothing/suit/space/pirate/tiziran/yellow + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow diff --git a/tgstation.dme b/tgstation.dme index 36325b1ef63627..28ef342746ede0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7174,6 +7174,7 @@ #include "modular_doppler\modular_cosmetics\code\storage\medical\base_overrides.dm" #include "modular_doppler\modular_cosmetics\code\suits\basesuits.dm" #include "modular_doppler\modular_cosmetics\code\suits\cargo.dm" +#include "modular_doppler\modular_cosmetics\code\suits\hardsuits.dm" #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm" #include "modular_doppler\modular_cosmetics\code\suits\labcoat.dm" #include "modular_doppler\modular_cosmetics\code\suits\mining.dm" From f1d1d7861ca20023e3d34d18e7ba2eb01786ec45 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 28 Dec 2025 23:52:35 -0800 Subject: [PATCH 16/38] fixes some ship and gun stuff --- .../~doppler_shuttles/tiziran_corvette.dmm | 104 +++---- .../tiziran_raider_shuttle.dmm | 294 +++++++++--------- .../modular_cosmetics/code/head/head.dm | 10 +- .../modular_weapons/code/ammo/bolt_shot.dm | 2 +- .../modular_weapons/code/guns/naval_gun.dm | 9 +- .../code/shuttle_templates/antag_ships.dm | 6 +- 6 files changed, 211 insertions(+), 214 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index b055095a9b4b7d..f12bad98b011e8 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -30,6 +30,13 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) +"ci" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_interceptor) "dr" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/reagent_containers/cup/glass/trophy{ @@ -143,15 +150,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/personally_bought/tiziran_interceptor) -"hQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, +"hD" = ( +/obj/structure/cable, +/obj/machinery/light/red/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_interceptor) -"ia" = ( +"hM" = ( +/obj/machinery/light/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"hQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/directional/south, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "ip" = ( @@ -160,10 +170,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) -"iY" = ( -/obj/machinery/light/red/directional/west, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "ju" = ( /obj/machinery/computer/shuttle/pirate{ dir = 1 @@ -190,6 +196,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/personally_bought/tiziran_interceptor) +"mb" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/shelf, +/obj/machinery/light/red/directional/east, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "mZ" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ @@ -260,11 +272,6 @@ "ua" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) -"ut" = ( -/obj/structure/cable, -/obj/machinery/light/red/directional/west, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) "uE" = ( /obj/machinery/vending/imported/tiziran, /obj/machinery/light/red/directional/west, @@ -290,10 +297,15 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/personally_bought/tiziran_interceptor) -"vJ" = ( -/obj/structure/bed/pod, -/obj/structure/sign/poster/contraband/lizard/directional/south, -/turf/open/floor/iron/dark, +"vn" = ( +/obj/machinery/light/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) +"vr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_interceptor) "vS" = ( /obj/machinery/door/airlock/hatch, @@ -356,6 +368,13 @@ }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) +"xz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/red/directional/north, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_interceptor) "xT" = ( /turf/template_noop, /area/template_noop) @@ -423,13 +442,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) -"CB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/dim/directional/north, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) "CL" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -495,9 +507,10 @@ }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) -"Ho" = ( -/obj/machinery/light/red/directional/south, -/turf/open/floor/plating, +"GK" = ( +/obj/structure/bed/pod, +/obj/structure/sign/poster/contraband/lizard/directional/south, +/turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) "Hp" = ( /obj/structure/cable, @@ -545,13 +558,6 @@ /obj/machinery/light/red/directional/east, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) -"NP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/red/directional/north, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "Pk" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, @@ -567,12 +573,6 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_interceptor) -"PP" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, -/obj/machinery/light/red/directional/east, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "Ql" = ( /obj/machinery/computer/monitor{ dir = 1 @@ -760,13 +760,13 @@ xT nl ua CY -iY +vn rH rH zV -Ho +hM ua -NP +xz LH To To @@ -825,7 +825,7 @@ ua ua ua ua -nl +xT "} (7,1,1) = {" xT @@ -860,7 +860,7 @@ gp aN hQ ua -ut +hD jW sy ab @@ -906,7 +906,7 @@ xT gi fc wP -vJ +GK ua QK Pk @@ -980,7 +980,7 @@ xT (13,1,1) = {" xT nl -CB +ci Zt ya hC @@ -1175,7 +1175,7 @@ ua ua ua ua -nl +xT "} (21,1,1) = {" xT @@ -1217,7 +1217,7 @@ hQ hQ KJ hQ -ia +vr ua LH Ln @@ -1264,7 +1264,7 @@ ua wt Gt er -PP +mb ua gz Fy diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm index 8af28ecf8ce5a8..13a0f1f998e9c0 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm @@ -4,11 +4,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "bn" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"bB" = ( +/obj/structure/cable, +/obj/machinery/light/red/directional/west, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/pirate/tiziran_corvette) "cv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -16,7 +21,7 @@ /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "cE" = ( /obj/machinery/door/airlock/external, /obj/docking_port/mobile/pirate{ @@ -25,30 +30,30 @@ port_direction = 4 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "do" = ( /obj/machinery/porta_turret/syndicate{ dir = 1 }, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "dO" = ( /obj/machinery/door/airlock/external, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "ee" = ( /obj/structure/sign/poster/ripped/directional/west, /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, /obj/machinery/light/red/directional/west, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "eq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/curtain/bounty/start_closed, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "ex" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/button/door{ @@ -57,13 +62,13 @@ }, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "eY" = ( /obj/structure/chair/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "fA" = ( /obj/machinery/shuttle_scrambler, /obj/structure/cable, @@ -79,40 +84,34 @@ }, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "fF" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 8 }, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) -"fI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/directional/south, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "gG" = ( /obj/machinery/vending/imported/tiziran, /obj/machinery/light/red/directional/west, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "jl" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "kd" = ( /obj/machinery/door/airlock/external, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "kf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "kC" = ( /obj/machinery/computer/shuttle/pirate{ dir = 1 @@ -120,25 +119,29 @@ /obj/effect/turf_decal/tile/red/full, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"lm" = ( +/obj/machinery/light/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "lr" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "lS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "lW" = ( /obj/structure/chair/plastic{ dir = 4 }, /obj/structure/sign/poster/contraband/dolphin/directional/west, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "lY" = ( /obj/structure/shelf, /obj/item/grenade/firecracker{ @@ -169,14 +172,14 @@ pixel_x = 6 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "mJ" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "mN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -184,18 +187,18 @@ }, /obj/machinery/light/red/directional/west, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "nt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "nD" = ( /obj/structure/railing{ color = "#36373a" }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "og" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -204,42 +207,41 @@ /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "oF" = ( /obj/item/gun/ballistic/bolt_thrower, /obj/structure/shelf, -/obj/machinery/light/red/directional/east, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "pk" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /obj/machinery/loot_locator, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "pF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "pO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "pW" = ( /obj/effect/turf_decal/tile/red/half{ dir = 1 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "qc" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 1 }, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "qp" = ( /obj/structure/shelf, /obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ @@ -265,21 +267,21 @@ }, /obj/machinery/light/red/directional/east, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "qL" = ( /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "rs" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "rA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "te" = ( /obj/item/radio/intercom/syndicate/directional/north, /obj/structure/cable, @@ -288,24 +290,24 @@ dir = 8 }, /turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "tX" = ( /obj/structure/fluff/sat_dish, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "uo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/power/micro_reactor, /obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "vw" = ( /obj/machinery/deployable_turret/snub_particle_cannon{ pixel_y = -5 }, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "vV" = ( /obj/item/rolling_table_dock, /obj/effect/spawner/random/vendor_meal_sides/tizira, @@ -314,16 +316,23 @@ pixel_x = -9 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"wq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/turf/open/floor/iron/dark, +/area/shuttle/pirate/tiziran_corvette) "wI" = ( /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "xv" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "xT" = ( /obj/structure/shelf, /obj/item/melee/tizirian_sword{ @@ -336,48 +345,43 @@ pixel_x = 5 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "yj" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "yW" = ( /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "zh" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "zv" = ( /obj/structure/chair/plastic{ dir = 1 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "zR" = ( /obj/machinery/computer/monitor{ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "zX" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"An" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/red/directional/north, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"Av" = ( +/area/shuttle/pirate/tiziran_corvette) +"At" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/red/directional/south, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate/tiziran_corvette) "AC" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 1 @@ -386,13 +390,20 @@ dir = 4 }, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "AT" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"AW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/red/directional/north, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "Ba" = ( /obj/structure/railing{ color = "#36373a"; @@ -400,11 +411,11 @@ }, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Bf" = ( /obj/machinery/suit_storage_unit/tiziran_raiders/yellow, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Bi" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 1; @@ -413,33 +424,33 @@ view_range = 10 }, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "BS" = ( /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Dl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Dp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Dv" = ( /obj/structure/closet/crate/secure/plasma, /obj/item/stack/sheet/mineral/plasma/five, /obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "DH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Em" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/reagent_containers/cup/glass/trophy{ @@ -457,35 +468,28 @@ dir = 4 }, /turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) -"Ez" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/dim/directional/north, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "EI" = ( /obj/machinery/suit_storage_unit/tiziran_raiders/red, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "FQ" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "GE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "GI" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Id" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -501,21 +505,27 @@ }, /obj/machinery/light/red/directional/east, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"Il" = ( +/obj/item/gun/ballistic/bolt_thrower, +/obj/structure/shelf, +/obj/machinery/light/red/directional/east, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "In" = ( /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Is" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /obj/structure/curtain/bounty/start_closed, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "IB" = ( /obj/machinery/suit_storage_unit/tiziran_raiders, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "IN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -523,16 +533,16 @@ /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "IS" = ( /obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, /turf/open/floor/plating/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Ja" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Jc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -540,36 +550,36 @@ /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Je" = ( /obj/machinery/door/airlock/external, /obj/structure/cable, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "JW" = ( /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "LG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "LS" = ( /obj/effect/turf_decal/tile/red/half{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Mp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "MZ" = ( /turf/template_noop, /area/template_noop) @@ -578,16 +588,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "NK" = ( /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, /obj/structure/sign/poster/contraband/lizard/directional/south, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"PT" = ( -/obj/machinery/light/red/directional/west, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "QC" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "piratebridge" @@ -595,7 +601,7 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Ra" = ( /obj/machinery/computer/monitor{ dir = 1 @@ -603,43 +609,42 @@ /obj/structure/cable, /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Rf" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, /obj/machinery/light/red/directional/east, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) +"Rm" = ( +/obj/machinery/light/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "RO" = ( /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "SA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "SG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "SI" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) -"SU" = ( -/obj/structure/cable, -/obj/machinery/light/red/directional/west, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Ti" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Tv" = ( /obj/structure/cable, /obj/structure/sign/flag/tizira/directional/north, @@ -647,68 +652,63 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "TK" = ( /obj/machinery/porta_turret/syndicate, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Un" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Vi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "VT" = ( /obj/structure/cable, /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "VY" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Xj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/hatch, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Xw" = ( /obj/structure/railing/eva_handhold/directional/east, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "XN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"Yl" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "Yq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) "ZK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/pirate/tiziran_corvette) (1,1,1) = {" MZ @@ -793,13 +793,13 @@ MZ BS Ja JW -PT +Rm ZK ZK Dl -Av +lm Ja -An +AW FQ In In @@ -858,7 +858,7 @@ Ja Ja Ja Ja -BS +MZ "} (7,1,1) = {" MZ @@ -893,7 +893,7 @@ vV zv SG Ja -SU +bB yj kd Ba @@ -1013,7 +1013,7 @@ MZ (13,1,1) = {" MZ BS -Ez +wq Nx VY Un @@ -1208,7 +1208,7 @@ Ja Ja Ja Ja -BS +MZ "} (21,1,1) = {" MZ @@ -1250,7 +1250,7 @@ SG SG AT GE -fI +At Ja FQ XN @@ -1272,7 +1272,7 @@ xT lY In In -Yl +oF Ja pO DH @@ -1296,8 +1296,8 @@ BS Ja qp lY -Yl oF +Il Ja Xw dO diff --git a/modular_doppler/modular_cosmetics/code/head/head.dm b/modular_doppler/modular_cosmetics/code/head/head.dm index dfa72bd820e720..0bb99f479a2d45 100644 --- a/modular_doppler/modular_cosmetics/code/head/head.dm +++ b/modular_doppler/modular_cosmetics/code/head/head.dm @@ -105,16 +105,16 @@ name = "Tiziran EVA helmet" desc = "An EVA-rated helmet specially suited to Tiziran physiology. Originally developed for special operations, time and surplusing \ have diffused this style of helmet across Tiziran-controlled space." - icon = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi' - worn_icon = 'modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi' + icon = 'modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi' icon_state = "tiziran_raider" - worn_icon_state = "tiziran_raider" + //worn_icon_state = "tiziran_raider" armor_type = /datum/armor/space_pirate /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red icon_state = "tiziran_raider_red" - worn_icon_state = "tiziran_raider_red" + //worn_icon_state = "tiziran_raider_red" /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow icon_state = "tiziran_raider_yellow" - worn_icon_state = "tiziran_raider_yellow" + //worn_icon_state = "tiziran_raider_yellow" diff --git a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm index c9d7fbbc3bfe0f..96cad0168cc63f 100644 --- a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm +++ b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm @@ -29,7 +29,7 @@ desc = "A stack of machined slugs." caliber = CALIBER_BOLT_THROWER ammo_type = /obj/item/ammo_casing/bolt_slug - max_ammo = 4 + max_ammo = 5 casing_w_spacing = 2 casing_z_padding = 6 diff --git a/modular_doppler/modular_weapons/code/guns/naval_gun.dm b/modular_doppler/modular_weapons/code/guns/naval_gun.dm index 59da8d5c102263..f0767c220df135 100644 --- a/modular_doppler/modular_weapons/code/guns/naval_gun.dm +++ b/modular_doppler/modular_weapons/code/guns/naval_gun.dm @@ -13,12 +13,11 @@ density = TRUE projectile_type = /obj/projectile/energy/snub_particle_cannon_bolt number_of_shots = 1 - cooldown_duration = 5 SECONDS + cooldown_duration = 10 SECONDS firesound = 'modular_doppler/modular_sounds/sound/items/particle_cannon.ogg' always_anchored = TRUE - cooldown_duration = 10 SECONDS - /// how much energy we take out of the grid when we fire a shot. uses WATTS - var/power_draw_per_shot = 2000 WATTS + /// how much energy we take out of the grid when we fire a shot. + var/power_draw_per_shot = 50 MEGA WATTS //specifically enough to drain the apc and brownout the ship /obj/machinery/deployable_turret/snub_particle_cannon/fire_helper(mob/user) . = ..() @@ -32,5 +31,5 @@ /obj/projectile/energy/snub_particle_cannon_bolt/on_hit(atom/target, blocked, pierce_hit) . = ..() - explosion(target, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 3, explosion_cause = src) //small concentrated explosion makes tiny breaches for ingress + explosion(target, devastation_range = 2, heavy_impact_range = 3, light_impact_range = 4, explosion_cause = src) //small concentrated explosion makes tiny breaches for ingress return BULLET_ACT_HIT diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm index 7ab33be9e87139..b237a2e65a7aa9 100644 --- a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -27,15 +27,13 @@ /area/shuttle/personally_bought/tiziran_interceptor name = "ITF Zul'kath" - requires_power = TRUE -// datum for the pirate shuttle +// datum for the tiziran pirate shuttle /datum/map_template/shuttle/pirate/tiziran_corvette prefix = "_maps/shuttles/~doppler_shuttles/" - suffix = "raider_shuttle" + suffix = "tiziran_raider_shuttle" name = "pirate ship (Tiziran Corvette)" /area/shuttle/pirate/tiziran_corvette name = "ITS Kaz'akran" - requires_power = TRUE From c4d9beaa2277d11fdd54ac676f3374cc28d1bd57 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 29 Dec 2025 00:18:58 -0800 Subject: [PATCH 17/38] explodes all life on planet earth --- ...raider_shuttle.dmm => pirate_tiziran_raider_shuttle.dmm} | 0 modular_doppler/modular_cosmetics/code/head/head.dm | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename _maps/shuttles/~doppler_shuttles/{tiziran_raider_shuttle.dmm => pirate_tiziran_raider_shuttle.dmm} (100%) diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm similarity index 100% rename from _maps/shuttles/~doppler_shuttles/tiziran_raider_shuttle.dmm rename to _maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm diff --git a/modular_doppler/modular_cosmetics/code/head/head.dm b/modular_doppler/modular_cosmetics/code/head/head.dm index 0bb99f479a2d45..d7a9b6725cf3e6 100644 --- a/modular_doppler/modular_cosmetics/code/head/head.dm +++ b/modular_doppler/modular_cosmetics/code/head/head.dm @@ -108,13 +108,13 @@ icon = 'modular_doppler/modular_cosmetics/icons/obj/head/helmet.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi' icon_state = "tiziran_raider" - //worn_icon_state = "tiziran_raider" + worn_icon_state = "tiziran_raider" armor_type = /datum/armor/space_pirate /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red icon_state = "tiziran_raider_red" - //worn_icon_state = "tiziran_raider_red" + worn_icon_state = "tiziran_raider_red" /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/yellow icon_state = "tiziran_raider_yellow" - //worn_icon_state = "tiziran_raider_yellow" + worn_icon_state = "tiziran_raider_yellow" From efa320972c71e9790d31621f45129a708f79ca00 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 30 Dec 2025 01:23:28 -0800 Subject: [PATCH 18/38] fixes helmets and da gun --- code/modules/projectiles/guns/ballistic.dm | 11 ++++++++++- .../modular_cosmetics/code/head/head.dm | 3 +++ .../icons/mob/head/helmet.dmi | Bin 1406 -> 1678 bytes .../modular_weapons/code/guns/naval_gun.dm | 9 ++++----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index ee3b0a1c962e3c..2a4b9e6d0fca0c 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -141,6 +141,10 @@ /// If it has an icon for a selector switch indicating current firemode. var/selector_switch_icon = FALSE + //DOPPLER ADDITION - allows firearms to display an internal magazine. necessary to prevent other firearms with internal magazines from runtiming. + var/display_internal_magazine = TRUE + //END DOPPLER ADDITION + /obj/item/gun/ballistic/Initialize(mapload) . = ..() if(!spawn_magazine_type) @@ -237,8 +241,13 @@ . += "[icon_state]_toy" - if(!magazine || !mag_display) //DOPPLER EDIT originally if(!magazine || internal_magazine || !mag_display) this allows guns with internal magazines to use the mag display function. + if(!magazine || !mag_display) //DOPPLER EDIT originally if(!magazine || internal_magazine || !mag_display) this allows guns with internal magazines to use the mag display function, c.f. below addition + return + +//DOPPLER ADDITION allows firearms to display an internal magazine + if(internal_magazine && !display_internal_magazine) return +//END DOPPLER ADDITION if(special_mags) . += "[icon_state]_mag_[initial(magazine.icon_state)]" diff --git a/modular_doppler/modular_cosmetics/code/head/head.dm b/modular_doppler/modular_cosmetics/code/head/head.dm index d7a9b6725cf3e6..3c18baab2c97b2 100644 --- a/modular_doppler/modular_cosmetics/code/head/head.dm +++ b/modular_doppler/modular_cosmetics/code/head/head.dm @@ -109,7 +109,10 @@ worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi' icon_state = "tiziran_raider" worn_icon_state = "tiziran_raider" + visor_dirt = "lizard_dirt" armor_type = /datum/armor/space_pirate + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi', //it only has a snouted variation, so we just make snoutless people wear a big silly helmet + BODYSHAPE_SNOUTED_T = 'modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi') /obj/item/clothing/head/helmet/space/pirate/tiziran_raider/red icon_state = "tiziran_raider_red" diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/helmet.dmi index 0ab464b9ef2a7a24847a931f482a55467a93366e..e72380ad998b62f02a96672d8d6630f892d92d2b 100644 GIT binary patch delta 1539 zcma)*dpOez7{`Be8zs|9Djp=GPFOV*W$0ptk+9?vYSYC;$=z&gPl#i3mdIs9DvS_2 zZo^{=rB<$)#7Qih9fq}IjyXDi^_;)X_n-HDp6@^J=Xt+h`6k+yd)gXgRTTgLILP2P z8zVCd7E4l!n#N&aJIcBgwX!GARx&3Ae1-28Kt-HusSPHj8UU1=(We}|Vhco{h*z-Q zx*g(ybW!G^r^(eN1|hdC(+!+M2m}wuwxDtcCwPgf+2Kvgkn-&=V#pms)aGPQ7sHCt zbU2&$3cDr!ammnYD??K$;W1KY_0qPOgd`M~G_C0;LUL`nF8ozWO3Nytr9G0nQn;#{ z!hh=J`c8Kg+7(rmn2OlC^8SJASi}u~5QMaH*;tfYBmVN06STdgN9`a(d8s;0cs6cp zw|0)>n({+R4E#dz<*`DkDYhsn!a$B)OIci847zf~DLXKsP_QC8=k4!b&|q?JTxEcy z-4C(D2)r?&R)P03K348NqC8T>J|Sh-JMj7k2I$zidIoTl;~qX%K7-|spscwwDEran z1Crv+)~}mF@pwF?^%wqUJ*SlX+?(_LkP%bg67VZm4ehTy=*f#{*Sl3?53Z%xqj@1b z>kpxh&VX9o(qxRySf)QiJ@BUaJn4;e?`Kb=n^f+c{0zy=9a!Br|3(_{(#;4OpA3_^ z3p8@3?CfZ`AlwN8scFym=pM^y9+YDoRx^hCJ<8C~*2)#^&hXeBBLBe3l$2g6hL@9` zOnuXSr$;qz`}9n`wJ#~s0@0684Cb2OJyv;jInT}$Mt5Fb5x=XBfTr%F!VRB;9xqKto^vY2Ewrx*@|nleFi%FR{GPj} zsLsxN6rs#fstB0(7;y9)&4zV80)x3MwQO6z^aip@%>~>P&XZE-EEXfhQIr%NdBs&e~Et(Ah#$szIh++~_=tjkPiFQp4?_iQ6Kh{Z~tS&DPW*J?{%zdrRG~8I=tdEKR-!$T+(}TBfR3Yx z0M|p`fNJ$o0#dn<5MVp;fss9q=3=qRbbVh3B9H}_fMzmi-zYZ%^zAP?F$;#l_XzsF zY{SG}YYFJSo5F|$WRz@XA_1kTfQLG}g`F}WMW8bn(YvxHXd4Fa{1f?zRN?G06p)dy z+*Bz8ikRoid33b5#nLq*<0_HdqZVW{K|opgmAy4+)CHEl1;~1+Q^VkhTExiCN+kK9 zP?N4661Mz-!l|u)$wc(Uzfo@<)iald4S`ed#}0y1$ub~K1`L7$3Fv3YjeWuH^bb(d ze@UOfG%AMjA$WXDe>G+^)f1oo3}UcYhU}!}D?3F!X5kj)1Du@MB5?z<1J;|=z>H4Li&}S)eex!fr^0O? z<@w15o4osH`CJ4OqDhRYArRe^kLSq#&T^a;{b9Gx$VS!n-g=?^xkjkiXn`e?DQ&n$ zjkqPBYiDRx8N`ijX$^yqigR{5OPZLJKDXdXq`f^6Ks|#L(*u;WNh`1e>)Eo2dKPQO zA_;@RxJ~hW31b|OTql5=1suA{Yk`OAAin&1TA}M}vQGGGXQ-3TT}7=P~wf1W+NCrnI1|Hfas*h%_Se|F7|B0)TeB(j52E&;Rjs N^l7(K)hB{({{ss^>(u}N delta 1283 zcmV+e1^oJs4gLy{7Y<+u1^@s6)p~kK0001kktKM4xO6Eixca$(Jpuq&`9EqcGw-bc z00g#4L_t(|obB9Oh*eb_$MMz0=3yA85UT4m9 zz8^S$?Ad2#_W!@vZLgR8cdj6R9e6e=>RPQ3rxvY{OQShlSX99Mpa0fK9yOaRPAhcA zbd-AlOlJ9_tBSf*OT=jx7w7#4&A>ZXE%&qS_PbWOPu|~Cd{+OVr>7^WR;#Y(+UwlV z&p)}&&d#Q-Kw%En7HWs@XPk07H*C3}8L`)Y?bw`Lf949`_R2xI3=Iv{6}zq#KsWs4 zbKBj*CCmI#=goWslxAP)J6&|td2FRpDbc5Q;jM`p++yn9)ehIJyxVt-O^z6JZN*S5 z#Z+vcTbheUhn5JKBtl8DGNLrMUBMnD2icJu~X&ufEN#?S0Un zt6erd(pN|>>U_1e>>7B@9ozk>>zdJj<Wye!L{^|zL z?}7ZxcPFzpNpnl`47}VU)Mmhqx7?K7s0M)K9ewpse8tvsXtqAF(dQ65{-JMw2a_p!MR$I1O+Nr_*4w}fa|>5SM55W~XJk4N?3icg-6)F}<`8=W4gdfE00000 z000000001hc0hfA>6rud0oojY^#R%(^#K~lA*>HD^7@fMSHEq&`5$=%`!qXkS(z zVBd@VZmjFv`|9mlA7E_ogj?L*?e5sI%b&-p5AgAZweE1G;yUJD?av#3tq+iU09fPO z>&W)1v~@zv4zQ*7o`>$Av_3$LH*?KI^#R28AvPFnZ}j1w{e|RW`wZJ}S*P3U;kxgj zK0vO4M}2@Cs1M+%4?ukYP#*vQ0000000000000000093})CZWJIZz*<%~2nq%~2nq zfgHm60GF5dy7gQ3HRbJpq?b3ZNd73Tq&|SON_~KvmyP?5iCrH+F%)Y`>jP-CUs`!M z`{iI}H?nJG^#M-&?y6~ Date: Tue, 30 Dec 2025 01:29:32 -0800 Subject: [PATCH 19/38] typo --- code/modules/projectiles/guns/ballistic.dm | 2 +- modular_doppler/modular_weapons/code/guns/bolt_thrower.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 2a4b9e6d0fca0c..2d00e898808e2c 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -142,7 +142,7 @@ var/selector_switch_icon = FALSE //DOPPLER ADDITION - allows firearms to display an internal magazine. necessary to prevent other firearms with internal magazines from runtiming. - var/display_internal_magazine = TRUE + var/display_internal_magazine = FLASE //END DOPPLER ADDITION /obj/item/gun/ballistic/Initialize(mapload) diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index b5c9bf92ee0bf1..e3476d4a460cb7 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -24,6 +24,7 @@ fire_sound = 'modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg' weapon_weight = WEAPON_HEAVY cartridge_wording = "slug" + display_internal_magazine = TRUE /obj/item/ammo_box/magazine/internal/bolt_thrower name = "bolt thrower internal magazine" From d27826d33289df2f89c484364fc102ff34a01c7d Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 30 Dec 2025 01:32:16 -0800 Subject: [PATCH 20/38] what if i made a second typo as a treat --- code/modules/projectiles/guns/ballistic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 2d00e898808e2c..2c06a237367355 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -142,7 +142,7 @@ var/selector_switch_icon = FALSE //DOPPLER ADDITION - allows firearms to display an internal magazine. necessary to prevent other firearms with internal magazines from runtiming. - var/display_internal_magazine = FLASE + var/display_internal_magazine = FALSE //END DOPPLER ADDITION /obj/item/gun/ballistic/Initialize(mapload) From 291c7317221568142542373826199bf366e70bab Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 30 Dec 2025 22:44:50 -0800 Subject: [PATCH 21/38] so close and yet so many bugs remain --- .../pirate_tiziran_raider_shuttle.dmm | 441 ++--- .../~doppler_shuttles/tiziran_corvette.dmm | 1414 +++++++++-------- .../antagonists/pirate/pirate_gangs.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 6 +- .../pirates/tiziran_raiders.dm | 12 + .../modular_weapons/code/guns/bolt_thrower.dm | 1 - 6 files changed, 1015 insertions(+), 861 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm index 13a0f1f998e9c0..f204fcb11b190c 100644 --- a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm @@ -1,9 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ao" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "bn" = ( /obj/structure/railing/eva_handhold/directional/west, @@ -23,13 +25,11 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "cE" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile/pirate{ - dir = 4; - preferred_direction = 4; - port_direction = 4 +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/door/window/survival_pod/left/directional/west{ + req_access = list("syndicate") }, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "do" = ( /obj/machinery/porta_turret/syndicate{ @@ -38,14 +38,32 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate/tiziran_corvette) "dO" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 + }, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "ee" = ( -/obj/structure/sign/poster/ripped/directional/west, -/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, -/obj/machinery/light/red/directional/west, -/turf/open/floor/iron/dark, +/obj/machinery/door/airlock/external{ + id_tag = "piratestarboardexternal"; + req_access = list("syndicate") + }, +/obj/docking_port/mobile/pirate{ + dir = 4; + preferred_direction = 4; + port_direction = 4 + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "eq" = ( /obj/structure/cable, @@ -93,24 +111,37 @@ /turf/open/floor/iron/dark/textured, /area/shuttle/pirate/tiziran_corvette) "gG" = ( -/obj/machinery/vending/imported/tiziran, -/obj/machinery/light/red/directional/west, -/turf/open/floor/plating, +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "jl" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "kd" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") + }, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark/airless, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron/dark/textured, /area/shuttle/pirate/tiziran_corvette) "kf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") }, -/turf/open/floor/iron/dark, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/pirate/tiziran_corvette) "kC" = ( /obj/machinery/computer/shuttle/pirate{ @@ -125,10 +156,9 @@ /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "lr" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/machinery/light/red/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "lS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -136,43 +166,24 @@ /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "lW" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/dolphin/directional/west, -/turf/open/floor/plating, -/area/shuttle/pirate/tiziran_corvette) -"lY" = ( +/obj/machinery/light/red/directional/west, /obj/structure/shelf, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/grenade/firecracker{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/lighter/skull{ - pixel_x = -6; - pixel_y = -8 - }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -4 +/obj/item/melee/tizirian_sword{ + pixel_x = -10 }, -/obj/item/grenade/firecracker{ - pixel_x = 6; - pixel_y = -2 +/obj/item/melee/tizirian_sword{ + pixel_x = -3 }, -/obj/item/grenade/firecracker{ - pixel_x = 6 +/obj/item/melee/tizirian_sword{ + pixel_x = 5 }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"lY" = ( +/obj/machinery/light/red/directional/east, +/obj/structure/kitchenspike, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "mJ" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ @@ -209,8 +220,8 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "oF" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/chem_dispenser/frontier_appliance, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "pk" = ( @@ -243,30 +254,16 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate/tiziran_corvette) "qp" = ( -/obj/structure/shelf, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -6; - pixel_y = 3 +/obj/machinery/door/airlock/external{ + id_tag = "piratestarboardexternal"; + req_access = list("syndicate") }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -8; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/obj/machinery/light/red/directional/east, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "qL" = ( /obj/effect/turf_decal/tile/red/full, @@ -309,20 +306,25 @@ /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/pirate/tiziran_corvette) "vV" = ( -/obj/item/rolling_table_dock, -/obj/effect/spawner/random/vendor_meal_sides/tizira, -/obj/item/reagent_containers/condiment/pack/ketchup{ - pixel_y = 7; - pixel_x = -9 +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") }, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "wq" = ( +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") + }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/dim/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "wI" = ( /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain, @@ -334,17 +336,13 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "xT" = ( -/obj/structure/shelf, -/obj/item/melee/tizirian_sword{ - pixel_x = -10 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = -3 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = 5 - }, -/turf/open/floor/plating, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "yj" = ( /obj/structure/cable, @@ -358,8 +356,27 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "zv" = ( -/obj/structure/chair/plastic{ - dir = 1 +/obj/structure/shelf, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -8; + pixel_y = 4 }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) @@ -392,9 +409,12 @@ /turf/open/floor/iron/dark/textured, /area/shuttle/pirate/tiziran_corvette) "AT" = ( -/obj/machinery/door/airlock/external, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/plastic{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "AW" = ( @@ -485,10 +505,13 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "GI" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/structure/sign/poster/ripped/directional/west, +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran, +/obj/machinery/light/red/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "Id" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -507,32 +530,39 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "Il" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, -/obj/machinery/light/red/directional/east, +/obj/machinery/oven/range_frontier, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "In" = ( /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Is" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/curtain/bounty/start_closed, -/turf/open/floor/iron/dark, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "IB" = ( /obj/machinery/suit_storage_unit/tiziran_raiders, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "IN" = ( -/obj/structure/cable, +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "IS" = ( /obj/machinery/power/shuttle_engine/propulsion{ @@ -549,17 +579,50 @@ }, /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, +/obj/structure/shelf, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/grenade/firecracker{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/lighter/skull{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/grenade/firecracker{ + pixel_x = 6 + }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Je" = ( -/obj/machinery/door/airlock/external, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "JW" = ( /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"La" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate/tiziran_corvette) "LG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -580,6 +643,11 @@ /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"MV" = ( +/obj/structure/sign/poster/contraband/dolphin/directional/east, +/obj/machinery/vending/imported/tiziran, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "MZ" = ( /turf/template_noop, /area/template_noop) @@ -641,9 +709,17 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate/tiziran_corvette) "Ti" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/structure/shelf, +/obj/item/gun/ballistic/bolt_thrower{ + pixel_x = 4; + pixel_y = -8 + }, +/obj/item/gun/ballistic/bolt_thrower{ + pixel_x = 2; + pixel_y = -4 + }, +/obj/item/gun/ballistic/bolt_thrower, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Tv" = ( /obj/structure/cable, @@ -680,14 +756,17 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "Xj" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/hatch, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Xw" = ( /obj/structure/railing/eva_handhold/directional/east, @@ -700,10 +779,13 @@ /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Yq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "ZK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -719,7 +801,7 @@ MZ MZ MZ SI -cE +ee bn Ja Ja @@ -733,7 +815,6 @@ MZ MZ MZ MZ -MZ "} (2,1,1) = {" MZ @@ -758,7 +839,6 @@ BS MZ MZ MZ -MZ "} (3,1,1) = {" MZ @@ -769,11 +849,11 @@ MZ BS Ja Ja -Ti +qp Ja Dl Dl -lr +gG Dp RO In @@ -783,7 +863,6 @@ Ja BS MZ MZ -MZ "} (4,1,1) = {" MZ @@ -808,7 +887,6 @@ FQ Ja TK MZ -MZ "} (5,1,1) = {" MZ @@ -820,7 +898,7 @@ Jc Dl ZK ZK -In +Bf Ja BS BS @@ -833,18 +911,17 @@ In In Ja BS -MZ "} (6,1,1) = {" MZ MZ do Ja -gG +lW nt Vi -In -In +EI +IB Ja BS MZ @@ -858,13 +935,12 @@ Ja Ja Ja Ja -MZ "} (7,1,1) = {" MZ IS qc -lW +Ti In nt Ja @@ -883,19 +959,18 @@ MZ MZ MZ MZ -MZ "} (8,1,1) = {" MZ IS qc -vV zv +In SG Ja bB yj -kd +kf Ba MZ MZ @@ -908,7 +983,6 @@ MZ MZ MZ MZ -MZ "} (9,1,1) = {" IS @@ -916,9 +990,9 @@ qc Ja Ja Ja -GI +Yq Ja -Je +kd Ja BS vw @@ -933,12 +1007,11 @@ MZ MZ MZ MZ -MZ "} (10,1,1) = {" IS qc -ee +GI NK Ja Vi @@ -958,13 +1031,12 @@ MZ MZ MZ MZ -MZ "} (11,1,1) = {" IS qc -eq -Is +Nx +La Ja og yW @@ -983,13 +1055,12 @@ MZ MZ MZ MZ -MZ "} (12,1,1) = {" MZ BS -IN -kf +eq +Ja Ja Tv Em @@ -1008,12 +1079,11 @@ MZ MZ MZ MZ -MZ "} (13,1,1) = {" MZ BS -wq +xT Nx VY Un @@ -1033,12 +1103,11 @@ MZ MZ MZ MZ -MZ "} (14,1,1) = {" MZ BS -Xj +ao Ja Ja te @@ -1058,7 +1127,6 @@ MZ MZ MZ MZ -MZ "} (15,1,1) = {" IS @@ -1083,7 +1151,6 @@ MZ MZ MZ MZ -MZ "} (16,1,1) = {" IS @@ -1108,7 +1175,6 @@ MZ MZ MZ MZ -MZ "} (17,1,1) = {" IS @@ -1133,7 +1199,6 @@ MZ MZ MZ MZ -MZ "} (18,1,1) = {" MZ @@ -1142,7 +1207,7 @@ qc uo Dv Ja -VY +wq Ja BS tX @@ -1158,7 +1223,6 @@ MZ MZ MZ MZ -MZ "} (19,1,1) = {" MZ @@ -1168,7 +1232,7 @@ lS lS Mp Vi -Bf +In Ja TK MZ @@ -1183,7 +1247,6 @@ MZ MZ MZ MZ -MZ "} (20,1,1) = {" MZ @@ -1194,7 +1257,7 @@ Rf In Vi In -EI +In Ja BS MZ @@ -1208,7 +1271,6 @@ Ja Ja Ja Ja -MZ "} (21,1,1) = {" MZ @@ -1216,24 +1278,23 @@ MZ MZ BS Ja -In -Vi +MV +AT SG SG -IB +In Ja BS BS Ja rA -ao +Is rA mN In In Ja BS -MZ "} (22,1,1) = {" MZ @@ -1242,13 +1303,13 @@ MZ MZ BS Ja -Yq -XN +dO +Xj SG SG SG SG -AT +IN GE At Ja @@ -1258,7 +1319,6 @@ FQ Ja TK MZ -MZ "} (23,1,1) = {" MZ @@ -1268,11 +1328,11 @@ MZ MZ BS Ja -xT -lY -In +Ja +Je In oF +cE Ja pO DH @@ -1283,7 +1343,6 @@ Ja BS MZ MZ -MZ "} (24,1,1) = {" MZ @@ -1294,13 +1353,13 @@ MZ MZ BS Ja -qp lY -oF +In Il +lr Ja Xw -dO +vV Ja In Ja @@ -1308,7 +1367,6 @@ BS MZ MZ MZ -MZ "} (25,1,1) = {" MZ @@ -1333,5 +1391,4 @@ MZ MZ MZ MZ -MZ "} diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index f12bad98b011e8..e39ca93465470d 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -1,482 +1,454 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/structure/railing{ - color = "#36373a"; - dir = 10 +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "af" = ( -/obj/machinery/deployable_turret/snub_particle_cannon{ - pixel_y = -5 - }, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) -"aN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair/plastic{ - dir = 1 + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"aN" = ( +/obj/structure/shelf, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ + pixel_x = -8; + pixel_y = 4 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "be" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"cb" = ( -/obj/structure/cable, -/obj/structure/marker_beacon/burgundy, +/area/shuttle/personally_bought/tiziran_corvette) +"bD" = ( +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"cb" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "ci" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/dim/directional/north, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"dr" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_y = 20; - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") }, -/obj/item/clothing/head/helmet/skull{ - pixel_x = 5; - pixel_y = -3 +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"cL" = ( +/obj/structure/railing{ + color = "#36373a"; + dir = 10 }, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_corvette) +"dr" = ( +/obj/structure/cable, +/obj/structure/sign/flag/tizira/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_corvette) "dC" = ( -/obj/structure/barricade/wooden/crude, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "er" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/chem_dispenser/frontier_appliance, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "eI" = ( +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "fc" = ( -/obj/machinery/power/shuttle_engine/heater{ +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/plating/airless, +/area/shuttle/personally_bought/tiziran_corvette) "fh" = ( -/obj/machinery/computer/monitor{ - dir = 1 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/button/door{ + id = "silverbridge"; + name = "Window Shutters Control" }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "fO" = ( -/obj/machinery/turretid{ - ailock = 1; - desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; - lethal = 1; - name = "Ship Turret Control"; - pixel_x = 30; - pixel_y = 4; - req_access = list("syndicate") - }, /obj/structure/cable, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "gi" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/power/port_gen/pacman/pre_loaded, +/obj/structure/cable, +/obj/machinery/light/red/directional/east, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "gj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/light/red/directional/west, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "gp" = ( -/obj/item/rolling_table_dock, -/obj/effect/spawner/random/vendor_meal_sides/tizira, -/obj/item/reagent_containers/condiment/pack/ketchup{ - pixel_y = 7; - pixel_x = -9 +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) "gz" = ( -/obj/structure/railing/eva_handhold/directional/east, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/sign/poster/contraband/lizard/directional/south, +/obj/structure/bed/pod, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "gE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "hi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/trophy{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/machinery/light/red/directional/east, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"hq" = ( /obj/machinery/suit_storage_unit/tiziran_raiders/red, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"hq" = ( +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "hC" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "hD" = ( -/obj/structure/cable, -/obj/machinery/light/red/directional/west, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) -"hM" = ( -/obj/machinery/light/red/directional/south, +/obj/structure/sign/poster/contraband/dolphin/directional/east, +/obj/machinery/vending/imported/tiziran, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"hM" = ( +/obj/machinery/door/airlock/external{ + id_tag = "pirateportexternal"; + req_access = list("syndicate") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "hQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "ip" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/curtain/bounty/start_closed, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "ju" = ( -/obj/machinery/computer/shuttle/pirate{ - dir = 1 - }, +/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/full, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "jW" = ( /obj/structure/cable, +/obj/machinery/light/red/directional/west, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) -"lg" = ( +/area/shuttle/personally_bought/tiziran_corvette) +"le" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"lh" = ( -/obj/structure/cable, -/obj/structure/sign/flag/tizira/directional/north, +/obj/machinery/light/red/directional/west, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) +"lg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"lh" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_corvette) "mb" = ( -/obj/item/gun/ballistic/bolt_thrower, -/obj/structure/shelf, -/obj/machinery/light/red/directional/east, +/obj/machinery/oven/range_frontier, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "mZ" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/half{ - dir = 8 +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ + dir = 1; + x_offset = 12; + y_offset = 5; + view_range = 10 }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) "nl" = ( /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "nw" = ( -/obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/mineral/plasma/five, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/micro_reactor, +/obj/structure/cable, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "oO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 + dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "pb" = ( -/obj/machinery/suit_storage_unit/tiziran_raiders, +/obj/structure/shelf, +/obj/item/gun/ballistic/bolt_thrower{ + pixel_x = 4; + pixel_y = -8 + }, +/obj/item/gun/ballistic/bolt_thrower{ + pixel_x = 2; + pixel_y = -4 + }, +/obj/item/gun/ballistic/bolt_thrower, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"qv" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile/personally_bought{ - dir = 4 +/area/shuttle/personally_bought/tiziran_corvette) +"pG" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"rl" = ( +/obj/machinery/loot_locator, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) +"qv" = ( /obj/structure/railing/eva_handhold/directional/west, /turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"rl" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) "rn" = ( -/obj/effect/turf_decal/tile/red/half{ +/obj/item/radio/intercom/syndicate/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_corvette) "rF" = ( -/obj/structure/chair/bronze, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/smooth_half, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark/smooth_large, +/area/shuttle/personally_bought/tiziran_corvette) "rH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "rO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/light/red/directional/west, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "sy" = ( -/obj/machinery/door/airlock/external, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "ua" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/door/airlock/external{ + id_tag = "piratestarboardexternal"; + req_access = list("syndicate") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "uE" = ( -/obj/machinery/vending/imported/tiziran, -/obj/machinery/light/red/directional/west, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "uT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/curtain/bounty/start_closed, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "uV" = ( -/obj/structure/fluff/sat_dish, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/suit_storage_unit/tiziran_raiders/yellow, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "uW" = ( -/obj/item/radio/intercom/syndicate/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark/smooth_large, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "vn" = ( -/obj/machinery/light/red/directional/west, +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "vr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/red/directional/south, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "vS" = ( -/obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "wt" = ( -/obj/structure/shelf, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full{ - pixel_x = -8; - pixel_y = 4 +/obj/machinery/deployable_turret/snub_particle_cannon{ + pixel_y = -5 }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_corvette) +"wu" = ( /obj/machinery/light/red/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"wu" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "wP" = ( -/obj/structure/sign/poster/ripped/directional/west, -/obj/structure/bed/pod, -/obj/machinery/light/red/directional/west, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "xc" = ( +/obj/machinery/door/airlock/hatch, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/effect/mapping_helpers/airlock/cutaiwire, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "xm" = ( -/obj/structure/shelf, -/obj/item/melee/tizirian_sword{ - pixel_x = -10 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = -3 - }, -/obj/item/melee/tizirian_sword{ - pixel_x = 5 +/obj/structure/railing{ + color = "#36373a" }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_corvette) "xz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 + dir = 4 }, -/obj/machinery/light/red/directional/north, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "xT" = ( /turf/template_noop, /area/template_noop) "ya" = ( -/obj/machinery/door/airlock/hatch, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/directional/south, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "yQ" = ( -/obj/structure/bed/pod, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"zl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"zV" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"AC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"AQ" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"AW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"Bj" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/dolphin/directional/west, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"BI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/bottle/lizardwine{ + pixel_x = -4; + pixel_y = 5 }, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"BV" = ( -/obj/machinery/suit_storage_unit/tiziran_raiders/yellow, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"Ci" = ( -/obj/effect/turf_decal/tile/red/half{ - dir = 1 +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 7; + pixel_y = 7 }, +/obj/machinery/light/red/directional/east, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"CL" = ( -/obj/structure/railing/eva_handhold/directional/west, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/personally_bought/tiziran_interceptor) -"CY" = ( -/obj/structure/tank_dispenser/oxygen, +/area/shuttle/personally_bought/tiziran_corvette) +"zl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) -"DA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/curtain/bounty/start_closed, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"Ek" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"En" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/button/door{ - id = "silverbridge"; - name = "Window Shutters Control" +/area/shuttle/personally_bought/tiziran_corvette) +"zV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) -"Fy" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) -"Gt" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /obj/structure/shelf, /obj/item/grenade/firecracker{ pixel_x = -6; @@ -506,176 +478,319 @@ pixel_x = 6 }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"AC" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) +"AQ" = ( +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) +"AW" = ( +/obj/machinery/light/red/directional/west, +/obj/structure/shelf, +/obj/item/melee/tizirian_sword{ + pixel_x = -10 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = -3 + }, +/obj/item/melee/tizirian_sword{ + pixel_x = 5 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) +"Bj" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_corvette) +"BI" = ( +/obj/machinery/light/red/directional/south, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) +"BV" = ( +/obj/structure/fluff/sat_dish, +/turf/open/floor/catwalk_floor/iron_dark/airless, +/area/shuttle/personally_bought/tiziran_corvette) +"Ci" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_y = 20; + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/item/clothing/head/helmet/skull{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_corvette) +"CL" = ( +/obj/machinery/door/airlock/external{ + id_tag = "piratestarboardexternal"; + req_access = list("syndicate") + }, +/obj/docking_port/mobile/pirate{ + dir = 4; + preferred_direction = 4; + port_direction = 4 + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"CY" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_corvette) +"DA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"Ek" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) +"En" = ( +/obj/effect/turf_decal/tile/red/half{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) +"Fy" = ( +/obj/structure/railing/eva_handhold/directional/east, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_corvette) +"Gt" = ( +/obj/machinery/light/red/directional/east, +/obj/structure/kitchenspike, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "GK" = ( +/obj/structure/sign/poster/ripped/directional/west, +/obj/machinery/light/red/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /obj/structure/bed/pod, -/obj/structure/sign/poster/contraband/lizard/directional/south, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "Hp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/hatch, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_corvette) "HE" = ( -/obj/machinery/porta_turret/syndicate{ +/obj/machinery/computer/shuttle/pirate{ dir = 1 }, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/effect/turf_decal/tile/red/full, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) "IA" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/shuttle_scrambler, /obj/structure/cable, +/obj/machinery/turretid{ + ailock = 1; + desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; + icon_state = "control_kill"; + lethal = 1; + name = "Ship Turret Control"; + pixel_x = 30; + pixel_y = 4; + req_access = list("syndicate") + }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "KJ" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/porta_turret/syndicate{ + dir = 1 + }, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/personally_bought/tiziran_corvette) "Ln" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/item/rolling_table_dock, +/obj/effect/spawner/random/vendor_meal_sides/tizira, +/obj/item/reagent_containers/condiment/pack/ketchup{ + pixel_y = 7; + pixel_x = -9 + }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "LH" = ( -/obj/structure/girder/reinforced, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "MW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/micro_reactor, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "Nk" = ( -/obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/structure/cable, -/obj/machinery/light/red/directional/east, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/bed/pod, +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "Pk" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/railing/eva_handhold/directional/west, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/personally_bought/tiziran_corvette) "Pv" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 8 - }, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) -"PG" = ( -/obj/effect/turf_decal/tile/red/full, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"PG" = ( +/obj/structure/chair/bronze, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/marker_beacon/burgundy, +/turf/open/floor/iron/dark/smooth_half, +/area/shuttle/personally_bought/tiziran_corvette) "Ql" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, /obj/structure/cable, /obj/structure/marker_beacon/burgundy, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "Qu" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ - dir = 1; - x_offset = 12; - y_offset = 5; - view_range = 10 +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 }, +/obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "QK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) +"QV" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/door/window/survival_pod/left/directional/west{ + req_access = list("syndicate") + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "Re" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "Rm" = ( -/obj/structure/marker_beacon/burgundy, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "Ry" = ( +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") + }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/syndicate_access, -/obj/effect/mapping_helpers/apc/cell_10k, +/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "SH" = ( -/obj/structure/chair/comfy/shuttle, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "Ta" = ( -/obj/machinery/porta_turret/syndicate, -/turf/closed/wall/mineral/plastitanium, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "Tc" = ( -/obj/structure/railing{ - color = "#36373a" +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" }, -/turf/open/floor/catwalk_floor/iron_dark/airless, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "To" = ( +/obj/structure/girder/reinforced, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "TS" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/suit_storage_unit/tiziran_raiders, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "UY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron/dark/textured, +/area/shuttle/personally_bought/tiziran_corvette) +"WH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) "WO" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 - }, +/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "XB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/obj/machinery/light/red/directional/north, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "YT" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 - }, +/obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ dir = 4 }, -/turf/open/floor/iron/dark/textured, -/area/shuttle/personally_bought/tiziran_interceptor) +/turf/open/floor/iron/dark, +/area/shuttle/personally_bought/tiziran_corvette) "Zt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/dim/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, -/area/shuttle/personally_bought/tiziran_interceptor) +/area/shuttle/personally_bought/tiziran_corvette) (1,1,1) = {" xT @@ -685,18 +800,17 @@ xT xT xT xT -rl qv CL -ua -ua +Pk +lh +lh nl xT xT nl -ua -Ta -xT +lh +Hp xT xT xT @@ -710,22 +824,21 @@ xT xT xT nl -ua -oO -ua -To -To -ua +lh +xz +lh +hq +hq +lh nl nl -ua -To -ua +lh +hq +lh nl xT xT xT -xT "} (3,1,1) = {" xT @@ -734,23 +847,22 @@ xT xT xT nl +lh +lh ua -ua -wu -ua -zV -zV +lh +vS vS xc dC +Ta +hq +hq To -To -LH -ua +lh nl xT xT -xT "} (4,1,1) = {" xT @@ -758,23 +870,22 @@ xT xT xT nl -ua -CY +lh vn +gj rH rH -zV -hM -ua -xz -LH -To +vS +BI +lh +XB To +hq +hq +hq To -LH -ua -Ta -xT +lh +Hp xT "} (5,1,1) = {" @@ -782,63 +893,60 @@ xT xT xT nl -ua -UY +lh zV +vS rH rH -To -ua +uV +lh nl nl -ua -To -To -To -LH -To +lh +uE +hq +hq To -ua +hq +hq +lh nl -xT "} (6,1,1) = {" xT xT -HE -ua -uE +KJ +lh AW -QK -To -To -ua +DA +Rm +hi +TS +lh nl xT xT nl -ua -ua -ua -ua -ua -ua -ua -ua -xT +lh +lh +lh +lh +lh +lh +lh +lh "} (7,1,1) = {" xT -gi fc Bj -To -AW -ua -ua -ua -Ta -xT +pb +hq +DA +lh +lh +lh +Hp xT xT xT @@ -854,17 +962,16 @@ xT "} (8,1,1) = {" xT -gi fc -gp +Bj aN +hq hQ -ua -hD +lh jW sy ab -xT +cL xT xT xT @@ -878,18 +985,17 @@ xT xT "} (9,1,1) = {" -gi fc -ua -ua -ua -Ek -ua -IA -ua +Bj +lh +lh +lh +bD +lh +UY +lh nl -af -xT +wt xT xT xT @@ -903,18 +1009,17 @@ xT xT "} (10,1,1) = {" -gi fc -wP +Bj GK -ua -QK -Pk -cb +gz +lh +Rm +fO Ql -AC +rl Tc -xT +xm xT xT xT @@ -928,18 +1033,17 @@ xT xT "} (11,1,1) = {" -gi fc -DA +Bj uT -ua -Ry +uW +lh gE SH YT -AC -AC -xT +gp +Tc +Tc xT xT xT @@ -955,16 +1059,15 @@ xT (12,1,1) = {" xT nl -Zt ip -ua +lh lh dr Ci En fh AC -xT +Tc xT xT xT @@ -980,16 +1083,15 @@ xT (13,1,1) = {" xT nl -ci Zt -ya +uT hC rF PG AQ ju -AC -xT +HE +Tc xT xT xT @@ -1005,16 +1107,15 @@ xT (14,1,1) = {" xT nl -Hp -ua -ua -uW -rn -Ci Pv +lh +lh +rn +CY +En Qu -AC -xT +mZ +Tc xT xT xT @@ -1028,18 +1129,17 @@ xT xT "} (15,1,1) = {" -gi fc -Zt +Bj +uT +MW +lh lg -ua -Re -QK -mZ +Rm WO -AC -AC -xT +pG +Tc +Tc xT xT xT @@ -1053,17 +1153,16 @@ xT xT "} (16,1,1) = {" -gi fc -hi +Bj yQ -ua -XB +Nk +lh QK -Pk +Rm fO -AC -xT +IA +Tc xT xT xT @@ -1078,15 +1177,15 @@ xT xT "} (17,1,1) = {" -gi fc -ua -ua -ua -ua -QK +Bj +lh +lh +lh +lh Rm -ua +wP +lh nl xT xT @@ -1100,20 +1199,18 @@ xT xT xT xT -xT "} (18,1,1) = {" xT -gi fc -MW +Bj nw -ua -ya -ua +cb +lh +Ry +lh nl -uV -xT +BV xT xT xT @@ -1129,16 +1226,15 @@ xT "} (19,1,1) = {" xT -gi fc +Bj be be -be -QK -BV -ua -Ta -xT +WH +Rm +hq +lh +Hp xT xT xT @@ -1155,52 +1251,50 @@ xT (20,1,1) = {" xT xT -HE -ua -Nk -To -QK -To +KJ +lh +gi hq -ua +Rm +hq +hq +lh nl xT xT nl -ua -ua -ua -ua -ua -ua -ua -ua -xT +lh +lh +lh +lh +lh +lh +lh +lh "} (21,1,1) = {" xT xT xT nl -ua -To -QK +lh +hD +af hQ hQ -pb -ua +hq +lh nl nl -ua -eI -TS +lh +rO eI rO -To -To -ua +le +hq +hq +lh nl -xT "} (22,1,1) = {" xT @@ -1208,23 +1302,22 @@ xT xT xT nl -ua -BI +lh Ln +oO hQ hQ hQ hQ -KJ -hQ +hM vr -ua -LH -Ln +ya +lh +To LH -ua -Ta -xT +To +lh +Hp xT "} (23,1,1) = {" @@ -1234,23 +1327,22 @@ xT xT xT nl -ua -xm -Gt -To -To +lh +lh +Re +hq er -ua -gj +QV +lh zl -ua -dC -LH -ua +Ek +lh +Ta +To +lh nl xT xT -xT "} (24,1,1) = {" xT @@ -1260,22 +1352,21 @@ xT xT xT nl -ua -wt +lh Gt -er +hq mb -ua -gz +wu +lh Fy -ua -To -ua +ci +lh +hq +lh nl xT xT xT -xT "} (25,1,1) = {" xT @@ -1286,17 +1377,16 @@ xT xT xT nl -ua -ua -ua -ua +lh +lh +lh +lh nl xT xT nl -ua -Ta -xT +lh +Hp xT xT xT diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index 8469fbdb718061..bb7451e212a06a 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) /datum/pirate_gang/New() . = ..() - ship_name = pick(strings(PIRATE_NAMES_FILE || DOPPLER_PIRATE_NAMES_FILE, ship_name_pool)) //DOPPLER EDIT originally ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) allows us to use a modular json for this + ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) ///whether this pirate gang can roll today. this is called when the global list initializes, so ///returning FALSE means it cannot show up at all for the entire round. diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 2c06a237367355..e0ab00430cae72 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -141,10 +141,6 @@ /// If it has an icon for a selector switch indicating current firemode. var/selector_switch_icon = FALSE - //DOPPLER ADDITION - allows firearms to display an internal magazine. necessary to prevent other firearms with internal magazines from runtiming. - var/display_internal_magazine = FALSE - //END DOPPLER ADDITION - /obj/item/gun/ballistic/Initialize(mapload) . = ..() if(!spawn_magazine_type) @@ -245,7 +241,7 @@ return //DOPPLER ADDITION allows firearms to display an internal magazine - if(internal_magazine && !display_internal_magazine) + if(internal_magazine && !mag_display) return //END DOPPLER ADDITION diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index c8c095909b6c8b..48715f3c055bce 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -12,6 +12,12 @@ response_received = "We have taken what is ours!" response_too_late = "We wait no longer! Perish!" response_not_enough = "This is an insult! Perish!" + response_rejected = "You will pay in flesh and blood!" + +/datum/pirate_gang/tiziran/New() + . = ..() + ship_name = pick(strings(DOPPLER_PIRATE_NAMES_FILE, ship_name_pool)) + /datum/outfit/pirate/tiziran name = "Tiziran Raider" @@ -36,6 +42,12 @@ outfit = /datum/outfit/pirate/tiziran rank = "swabbie" icon_state = "oldpod" + base_icon_state = "oldpod" + +/obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/create(mob/mob_possessor, newname) + . = ..() + var/mob/living/spawned_mob = . + spawned_mob.faction = list(ROLE_SYNDICATE) /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain name = "\improper Tiziran command sleeper" diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index e3476d4a460cb7..b5c9bf92ee0bf1 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -24,7 +24,6 @@ fire_sound = 'modular_doppler/modular_sounds/sound/items/bolt_thrower.ogg' weapon_weight = WEAPON_HEAVY cartridge_wording = "slug" - display_internal_magazine = TRUE /obj/item/ammo_box/magazine/internal/bolt_thrower name = "bolt thrower internal magazine" From ad1deb8fdcd8ddcd1b0b64f57c03f99ce49ae5c3 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 30 Dec 2025 23:07:08 -0800 Subject: [PATCH 22/38] Update antag_ships.dm --- .../ships_r_us/code/shuttle_templates/antag_ships.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm index b237a2e65a7aa9..5c1c6903e8873e 100644 --- a/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm +++ b/modular_doppler/ships_r_us/code/shuttle_templates/antag_ships.dm @@ -9,8 +9,8 @@ description = "A Tiziran warship built for high speed pursuits of lightly armed merchant farers." credit_cost = CARGO_CRATE_VALUE * 18 suffix = "corvette" - width = 29 - height = 28 + width = 25 + height = 22 personal_shuttle_size = PERSONAL_SHIP_LARGE /area/shuttle/personally_bought/tiziran_corvette From c6e74cdfd06f60e77c73d7e856f25a1b37497f19 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 31 Dec 2025 14:49:06 -0800 Subject: [PATCH 23/38] surely this fixes everything --- code/modules/projectiles/guns/ballistic.dm | 10 +++------- .../icons/mob/inhands/gun_lefthand.dmi | Bin 4895 -> 4668 bytes .../icons/mob/inhands/gun_righthand.dmi | Bin 4902 -> 4614 bytes 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e0ab00430cae72..f5ee113d4f4649 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -236,14 +236,10 @@ if(gun_flags & TOY_FIREARM_OVERLAY) . += "[icon_state]_toy" - - if(!magazine || !mag_display) //DOPPLER EDIT originally if(!magazine || internal_magazine || !mag_display) this allows guns with internal magazines to use the mag display function, c.f. below addition - return - -//DOPPLER ADDITION allows firearms to display an internal magazine - if(internal_magazine && !mag_display) + //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually + if(!magazine || internal_magazine && !mag_display) //originally if(!magazine || internal_magazine && !mag_display) + //END DOPPLER EDIT return -//END DOPPLER ADDITION if(special_mags) . += "[icon_state]_mag_[initial(magazine.icon_state)]" diff --git a/modular_doppler/modular_weapons/icons/mob/inhands/gun_lefthand.dmi b/modular_doppler/modular_weapons/icons/mob/inhands/gun_lefthand.dmi index 3ce3e55d6adfcbd2856c9b91742b8083c8cb0828..0ca27b598beb04a6d9ff254496b3ea3728873213 100644 GIT binary patch delta 4354 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 delta 4574 zcmV<45h3opB%dab=zkI+NkltMPx&qWPoKN&IcHzb?m2uvGiT18J-g37`|R`IX9mxnd(YoFlhFece~6`L z#F}yqGz9pr_ReTK<^7yw=T`c0{b@t7i3%RW&`&J7>OIyZ-T9>aQ}Ftbf^U z{)^jVmFd?(_NVs8a6tebJMq|IGhf{JqPz9Zd))d}54#8NzSl*)uX&3SZ|Z? zHZHvKayM;YmTOc8$=d#-KYAm9*r9s*`}>1V)Hn9*fU=$2x&^B+uS(@cPMzN4f_deZ{?d$k<`^ zT6q2c1n*sa^S|cS+3&pR<27yfq|+Zsee5KU0l{Y{X3;hd*ty+(@~p##wb4I5U5ji> zt54zzStrpYkX=IASzDbX@13kVyM$L;qz&*S!tGzg<-S-T`l346RG0t$x!|}P1!_~x z3P6p3W!I%B`_*WL&Y}R+h@0n#3X{zImjpY_1lAKzs-i;e#eE^vHDc8&4<;igO7hJ@3RR7m2%PP0DtPae9&v<^ziaJ__A6@neJYwJFI=Aa*P5M;bpYf)Uwqp=we1aO z%SlmZVL$(0n#-CZMnIqC3l!UqI*Z>{Sw_HCZC==@SC!*G>4ciLtu|b{;ir{5{-yKt z6Bbo|qqA346x{}8Z?Bo6>!M3a1z}O;1C!AMAb$Yu(S5&F4q3QRDZIpBT(9t1XP`*{&oY+V7#Ep?ZRs zM(vYTtG2f~q%C{O=sx$)K%Y_{(m0y}iBl`s5jee!b$9yXx6ZwSf~S49olY;NADu z-_J8J)cK>@VD@$MhP9csW21UxZTl<%sC~Gm|2TKY;Ln_$L)klsv zW5A6%ev*6bg$?eF&70hdPd(kTUYQSsrGH^~y>IzHjVdZp`R0 zK|TmQlo=^YnOfh>Oq)wpVMqFOB;=dyP!H}oV;iH33WeXk)J(j-Z}Gwgci!j z=K5XcJa(;qu01NxTeyD?dQa2qX8*a{yytztzTq+&DLW^i1>d&qzX&o5`3X(bLFUbw zow$Bl&rgox-0~nh(YUck=|yeR;PaJC?wVzvlWI#FDZ9%l7hPOC^M(bnqB@){M;%)8 z^lZ~#oN-1iDyvSbI)vw2k`^mlk04vqp0e%XZ#SwA{&b^d?Gb;qt*Fslbyc0??q3!P zzSE`+)VCEL`Se;j1Cx}g<+Yx@wzIsw*7mAA5~kVbr1EN`h9jVLAV1$(9N~0PmTt_R z<@x{K9jmNx9ZtE()qe6%%j)H81Px~mQVuuE*%qXZ^0wQk4mRCr*+%){^!lD}-ZgB0 z6@02|@V?tS!WMs-p6b;duR5J+?X%y;4TDZ+VjBfkE?=Q-*TRWA8_{yg#rNKN^|QRn zwQa0fzpAIG&zgBiy3a|qrH#U8@OGWi!`rmcSI<$Sravkbowh7I;zn&tb@c08=1Ayw z0Ckd9qk`V|M^CNaNh6;m-RGpbp^Xx0bop6z?F_y~)H#3RcF3rXRpn8xktF+^R1s~| z*1Mo-=>(mjJePBq9nU`VRGI1=cb}6gqKzuwpomYO zNoQX-Z&-g`_Sau|!ySCsK|#ln9yiiO-5%HHmYUlYOzW!*ThGtczI4$-m-VZoqF7KQ z+2^D>y^T;HeHPIT0Q(xkE|Ki!jQy2H)J+0^zLjIk_~ltSW$a%oN%uLaZfGME%sNK+ z?rgIT*{ow3l~?tSm1Lij>XtS_8#L+w>KuND^xq-#JC^@dMx1i1tl2&%)vaxWHfr|A z+THrc)_MMcdbhR_lhFegfBQNh?TTAgOssw7#tRnA|I7y#TyxPu3&tPu?t+INfBWV< zD+hGDOh3%~zwf-{ezo=IdDW#Wy!G5wwO2N;cH__6nCovt>V$XLF*EnJ`LAAa-}(N_ z?sK>P7r#H*;Zg^nI@p#Kd$a$1=ZCM-8Q!A+DYEQNIN?3I_KDhAe=|;{Kg5u@k-qkY z57d7D%rU{V0#DO=7Mu2i@xTKQtiAKjJBhcW^~Q|ZyPac>ncyxt>Q^z8$TesGIb@3ASk?B)|&ZxjiQ%-n2mD?$F0*bre zEu(bQs8K;duf6tKuZem%Xvia<|?yG6)u1&ZnRne=%aD+rE9sH5(1pdB%?I zbGvu%a$C1<9k!h65mk1aI%i=cvFa0NG}mW9J?nFzd}PjUw{6?DVarUIFu`rww5i?} zD%a-u#*G{29$T{aQ-V%(J}W;w+WK`&d-ahAb-?MTP7MN40hwg1gpEm z+3$vL-nZ?ge|iMpxAv|2{D&`{yr<*5xu-Ms2JdTH&pOy6M~>X5)1P+Q%-YjW|G56T zRRG%bX+6kP7TW4jJQKdg@vL7I8 zZ@6P`<5=K@`6HEef~df3MrG{UwacmFo1Hsfja9~!xpxm6`j0$oy8G@Yj?WZ;Hm#Gw znl-DNmgS$AG(GFSr|a)EJ1L|+;e}63Nlti0O4Av`qoyu9|M|XqJ1Pi8`~JDPbKTb# zFK$`?SB7s+IAw0+HSDIJENQk%h*STL-NCXX{ah9IL{^0pUQyz9#uP@fG zl*L^xFOfe>2y~-X!PV~I69N!jPl46j+gqP*v`o}=(Fj0vt^WT0+Kg$Z*Mq515Jm-@ z*3j{E&Uv$Y)~|oYZQQaqHQeBqjY067eCiZ;@kdV!=6&X4qurf1 zeY|Nu)%#jbwBFFrP~pE#nmGU!eEKQzv{`U~GzJF;d;HI5)25x|eyiiey+-!e;*7AJU!msxv`KSvAd~71z_S!P(OWCl1!lOq{iCu>P|QM*Lqyq zju>9Aa%aH?^4RxQRIbX`cFLg3OYNru@AKFFps4CX}zTiP2bww~^$29Gw}kcmYBr%TT&240vB$cK(Qv3A9$uByfDh+0m|YrV4m zJSi=Iluonntu$(zcJsgci~172>vcl#`Qmm&zk{`_Zbi#02&>dK`b=h@{rGE@4q<0) zb)@heLcP{}e;YN*s$)@_?RzU#Ya9FPmilM3h(9$$g`F~a=02l=UTc0?b!wNWeQ%{o zZQ}=@&GUnhKm-aF6=aNrK*nj3PFfYe~>r;tKP9Y?T3`Ge@hgA>d=+> zdA5*nE;vIFqRJ8lVA9|#;wR%8<$|+}IHG#mBk%14c`EEPpnkJaKb)Fp5ZW&xhjYQ{ z$7n4b)pa*57`6^Uh$_oH02L5^(E0h>vdTLb98k7GMnL6hQ@%FkZL@h<(mNHA3l6A) zLIO~Ef7+C<&FC|l^0}oguZUc5Ko#U3fEta?8L=}M0rgoeeCIUDNa!zX8F5r*FuLy9 zMmUA=+Vzk3Tt9z@JNv?Cg6Uj#2q;h?om7GH^3NW3=YHbq;I(~rOY=2`zm9#j{NA_k z4AN0a)|)K+M?A_@$R((PLII+@ZFVO#?RSVte{#VAou-fgw9jkG+ot?&3LNEgORG^X zID!zJuJ8`5kxMsCW}b0^yKT|^iNBVxkx#*=&whD+tsz{3qD+Mbpr!adxOYVG`t>(= zC%!qN@AUlj^|eEuBOd{XGL0yD1NxGDaLfPSt<;^(xL-*G%kBv{)7#sde+7XO6?PX? zY|jc9eN|v1mOsB$5GwfWYX*OPE7PB!1tTEJRM_8whJ#ORI?f1a%Y@fgnT&+!7KMEV zEb=a8o@FxvqD=e!ZF~X{W$N0WqyRbr0SJ_c00c@z00JfYKlf6mvfL6OfdBvi07*qo IM6N<$f&$}`G5`Po diff --git a/modular_doppler/modular_weapons/icons/mob/inhands/gun_righthand.dmi b/modular_doppler/modular_weapons/icons/mob/inhands/gun_righthand.dmi index 24ce75436bb20f63c6e3d24e818d968850512b69..d7c9ef3f9ece7a2f3804a934c93a2b47a3c6eb18 100644 GIT binary patch delta 4293 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 R&OQJD002ovPDHLkV1h; Date: Wed, 31 Dec 2025 15:29:02 -0800 Subject: [PATCH 24/38] man idk --- code/modules/projectiles/guns/ballistic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index f5ee113d4f4649..eb419c33326e3e 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -237,7 +237,7 @@ . += "[icon_state]_toy" //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || internal_magazine && !mag_display) //originally if(!magazine || internal_magazine && !mag_display) + if(!magazine || internal_magazine & !mag_display) //originally if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return From fa6e2d9cc4e4bece6b1b6c6c4080e9b6f085cf6a Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 31 Dec 2025 15:52:48 -0800 Subject: [PATCH 25/38] hopefully probably fixes the pirate naming strings --- .../antagonists/pirate/pirate_gangs.dm | 4 +- code/modules/projectiles/guns/ballistic.dm | 2 +- strings/doppler_pirate_names.json | 263 +++++++++++++++++- 3 files changed, 265 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index bb7451e212a06a..dec47c06e4760a 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -54,7 +54,9 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) /datum/pirate_gang/New() . = ..() - ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) + //BEGIN DOPPLER EDIT - points us towards a modular ship naming file + ship_name = pick(strings(DOPPLER_PIRATE_NAMES_FILE, ship_name_pool)) // originally: ship_name = pick(strings(PIRATE_NAMES_FILE, ship_name_pool)) + //END DOPPLER EDIT ///whether this pirate gang can roll today. this is called when the global list initializes, so ///returning FALSE means it cannot show up at all for the entire round. diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index eb419c33326e3e..e966ab0aa75098 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -237,7 +237,7 @@ . += "[icon_state]_toy" //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || internal_magazine & !mag_display) //originally if(!magazine || internal_magazine || !mag_display) + if(!magazine || internal_magazine && !mag_display) //originally if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return diff --git a/strings/doppler_pirate_names.json b/strings/doppler_pirate_names.json index 6a320ed749b4d0..af33442fd929ea 100644 --- a/strings/doppler_pirate_names.json +++ b/strings/doppler_pirate_names.json @@ -1,9 +1,268 @@ { + "generic_beginnings": [ + "Comet", + "Ion", + "Laser", + "Oort", + "Plasma", + "Pulsar", + "Solar", + "Space", + "Star", + "Void" + ], + "generic_endings": [ + "beard", + "bilge", + "deck", + "fish", + "flag", + "helm", + "hook", + "hull", + "keel", + "knot", + "salt" + ], + "psyker_beginnings": [ + "Arch", + "Brain", + "Cheeze", + "Corpo", + "Crazy-", + "Cronen-", + "Dain", + "Doctor", + "Flesh", + "Fortune", + "Gore", + "Mad", + "Mind", + "Professor", + "Psychic-", + "Psycho", + "Snirby", + "Stun", + "Super", + "Wise" + ], + "psyker_endings": [ + "bound", + "brain", + "brammage", + "gore", + "guy", + "head", + "locked", + "naut", + "nuts", + "rat", + "reader", + "scanner", + "sponge", + "storm", + "teller", + "whiz" + ], + "rogue_names": [ + "Abyssal Titan", + "Ashes to Ashes", + "Asteroid Blaster", + "Asteroid Dragger", + "Bellowing Spacedragon", + "Blargbeam Solar-slider", + "Blood Money", + "Cosmic Gunboat", + "Customer Service", + "Deadman's Switch", + "Diplomacy Disputer", + "Driftbeam", + "Echoing Laughter", + "Electric Boogaloo", + "Ethical Principles", + "Fat Leg", + "Heaven's Cavaliers", + "I Am Become Death", + "I Love the Bomb", + "Ickity Pickety Startooth Knuckle Dragger", + "Khranitel Revolyutsii Escort Desserter", + "John Ship", + "Lizard Melter", + "Lost in Deep Space", + "Missile Rack", + "Moth Splatterer", + "New Sins for Old", + "One Last Job", + "Paint Asteroids Red", + "Pastafarianism", + "Raging Meteor", + "Reverse Far Leap", + "Scourge of the Milky Way", + "Silicon Policy", + "Space Grease", + "Space Justice", + "Space Pearl", + "Space Queen's Revenge", + "Star Scraper", + "Syndicate Privateer", + "The Mazianni", + "War as a Business", + "Xenophobia" + ], + "silverscale_names": [ + "Antelope's Run", + "Archduke's Silver Ring", + "Aristocrat's Principle", + "Aristocratic Tributary", + "Bane of Serfs", + "Benevolence of the Serpentine", + "Casus Belli", + "Celestial Lizardhawk", + "Divine Space Wind", + "Empire Sprawl", + "Guiding Hand", + "His Majesty's Chosen", + "Home Away from Home", + "Jewel of Tizira", + "Manifest Destiny", + "Necessary Evil", + "Pearly Gates", + "Pinnacle of the Stratocracy", + "Prince Regent", + "Right to Rule", + "Ruling Body", + "Serpentine Dominion", + "Silver Fox", + "Silver Steed", + "Silver Sterling", + "Silverchain's Sovereignty", + "Spaceflower", + "Status Quo", + "Swords and Sandals", + "Thesaurus Terror" + ], + "skeleton_names": ["Flying Dutchman"], + "interdyne_names": [ + "Pharmaceutics Biocraft", + "Angel Dust", + "Black Acid", + "Crystal Meth Rocks", + "Alpha Product Tester", + "Beta Unblocker", + "Spaceaids Commander", + "Polonium Vessel", + "Chemo Therastar", + "Lymphocraft", + "Diabetes Rusher", + "Schistosome Vector" + ], + "grey_names": [ + "The Space Toolbox", + "ISV Maintenance", + "S.S. Istant", + "Grey eminence", + "Gas Maskotron", + "Gri Efestar", + "Barhopper", + "Does-No-Job", + "N.R.S.S. Assistant", + "Pilk Full 26", + "Greytide Shipwide", + "The monochrome crash", + "Maintrastosphere Omega" + ], + "irs_names": [ + "Iron Shell Agency", + "Auroran Federal Tax Bureau", + "TerraGov Internal Revenue Service", + "Spinward Federal Taxation Office", + "Soviet Taxation Administration, 5th Service", + "Hiigaran Ministry of Taxation", + "Grand Fleet Tributary Patrol", + "Springbok Security Protection Service", + "Sindrian Revenue Authority", + "Space IRS" + ], + "psyker_names": [ + "Big Gulchergut for Gore", + "Blowkaine", + "Brainframe", + "Dead Freight", + "Debased", + "Dentist's Office", + "Echolocator", + "Free Your Mind", + "Galactic Crackhouse", + "Gaslighters", + "Gore Gore Gore", + "Gore-binger", + "Goretastic", + "Happy Dust", + "Headache", + "Heptadome", + "Home For The Disturbed", + "Kronkainery", + "Live Free or Die", + "Milkman Conspiracy", + "Mind Palace", + "Mind's Garden", + "Motherlobe", + "Planetarium", + "Psychoisolation", + "Psychosocial", + "Psychozone", + "Psykerden", + "Suppository", + "The Dreaming", + "Ultra Violence", + "Where We're Going" + ], + "geode_names": [ + "Gamma Knife", + "Planet B", + "Crumbling Castle", + "Cubensis Lenses", + "High Visceral", + "Sugar Tzu", + "Snakefinger", + "El Valle", + "Porselana Teeth", + "Constantinople", + "Lucidity", + "Following Zond", + "Elvis' Flaming Star", + "Casablanca Moon", + "Mass of Fermenting Dregs", + "Bloody Valentine", + "Wild Nothing" + ], + "medieval_names": [ + "Head Reaper", + "The Lords Judgement", + "The Judgement", + "Peasant Smiter", + "Wicked Ravager", + "Sheep Reaver", + "Never-ending Crusade", + "Locus Invicta", + "Memento Morieris", + "God Conqueror", + "Omnium Contra Omnes", + "Aries Duo", + "Dark Ages Bringer", + "Merciless Barricade", + "Murder Mcmurderface" + ], "tiziran_ships": [ "Blade Held Firm", "Dead World Wrath", - "Scale-breaker", + "Scale-Breaker", "Bite The Hand That Feeds Poison", - "" + "Scorn To The Heavens", + "Rampage Of Our Fallen Grace", + "Machine To Churn War", + "Spine-Breaker", + "Point Plunged Deep", + "Revenant Of Shattered Realm" ] } From e41a86d5f72f9d727b0ce2f42e42ff778b64ba81 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 31 Dec 2025 16:48:04 -0800 Subject: [PATCH 26/38] shuttle fixes --- .../pirate_tiziran_raider_shuttle.dmm | 2 +- .../~doppler_shuttles/tiziran_corvette.dmm | 35 +++++++++---------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm index f204fcb11b190c..3606fc3a140c69 100644 --- a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm @@ -75,7 +75,7 @@ "ex" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/button/door{ - id = "silverbridge"; + id = "piratebridge"; name = "Window Shutters Control" }, /obj/structure/marker_beacon/burgundy, diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index e39ca93465470d..92be482ac2e75e 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -124,7 +124,7 @@ "fh" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/button/door{ - id = "silverbridge"; + id = "piratebridge"; name = "Window Shutters Control" }, /obj/structure/marker_beacon/burgundy, @@ -243,11 +243,8 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "mZ" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ - dir = 1; - x_offset = 12; - y_offset = 5; - view_range = 10 +/obj/machinery/computer/camera_advanced/shuttle_docker/personally_bought{ + dir = 1 }, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_corvette) @@ -286,7 +283,9 @@ /obj/effect/turf_decal/tile/red/half{ dir = 8 }, -/obj/machinery/loot_locator, +/obj/machinery/computer/monitor{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_corvette) "qv" = ( @@ -540,15 +539,13 @@ id_tag = "piratestarboardexternal"; req_access = list("syndicate") }, -/obj/docking_port/mobile/pirate{ - dir = 4; - preferred_direction = 4; - port_direction = 4 - }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/docking_port/mobile/personally_bought{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "CY" = ( @@ -599,15 +596,14 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/personally_bought/tiziran_corvette) "HE" = ( -/obj/machinery/computer/shuttle/pirate{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/full, /obj/structure/marker_beacon/burgundy, +/obj/machinery/computer/shuttle/personally_bought{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_corvette) "IA" = ( -/obj/machinery/shuttle_scrambler, /obj/structure/cable, /obj/machinery/turretid{ ailock = 1; @@ -620,6 +616,9 @@ req_access = list("syndicate") }, /obj/structure/marker_beacon/burgundy, +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_corvette) "KJ" = ( @@ -682,10 +681,8 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "Qu" = ( -/obj/machinery/modular_computer/preset/engineering{ - dir = 8 - }, /obj/structure/marker_beacon/burgundy, +/obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/iron/dark/textured, /area/shuttle/personally_bought/tiziran_corvette) "QK" = ( From ec8267e59a73b4846a00c49592e74477e6d294dd Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 4 Jan 2026 02:18:23 -0800 Subject: [PATCH 27/38] why do unit tests on local take like twenty actual minutes --- code/modules/projectiles/guns/ballistic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e966ab0aa75098..b56ec58ca707ac 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -237,7 +237,7 @@ . += "[icon_state]_toy" //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || internal_magazine && !mag_display) //originally if(!magazine || internal_magazine || !mag_display) + if(!magazine || !mag_display || internal_magazine) //originally if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return From 2a5bff289994b8f3d5738b3ce68feb2e703d302c Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 4 Jan 2026 03:42:01 -0800 Subject: [PATCH 28/38] some little fixes + tizzy items in the uplink --- .../modular_antagonists/pirates/tiziran_raiders.dm | 7 +++++++ modular_doppler/modular_cosmetics/code/suits/hardsuits.dm | 2 +- modular_doppler/modular_uplink/code/dangerous_gear.dm | 8 ++++++++ modular_doppler/modular_uplink/code/suits.dm | 6 ++++++ modular_doppler/modular_weapons/code/guns/bolt_thrower.dm | 2 +- tgstation.dme | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 modular_doppler/modular_uplink/code/dangerous_gear.dm diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index 48715f3c055bce..4feaa3ec3c96a5 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -43,6 +43,7 @@ rank = "swabbie" icon_state = "oldpod" base_icon_state = "oldpod" + fluff_spawn = /obj/structure/showcase/machinery/tiziran_pod /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/create(mob/mob_possessor, newname) . = ..() @@ -53,6 +54,12 @@ name = "\improper Tiziran command sleeper" rank = "captain" +/obj/structure/showcase/machinery/empty_tiziran_pod + name = "empty sleeper pod" + desc = "Still cold, still humming. Whoever was in this is probably still nearby." + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "oldpod-open" + /obj/machinery/suit_storage_unit/tiziran_raiders suit_type = /obj/item/clothing/suit/space/pirate/tiziran helmet_type = /obj/item/clothing/head/helmet/space/pirate/tiziran_raider diff --git a/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm index 2852a878aafd64..c0cd0872fe7459 100644 --- a/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm +++ b/modular_doppler/modular_cosmetics/code/suits/hardsuits.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/space/pirate/tiziran - name = "Tiziran EVA suit" + name = "\improper Tiziran EVA suit" desc = "An EVA rated suit designed for Tiziran physiology. Its broad availability makes it a popular choice even beyond its issue to \ Imperial operators." icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/spacesuit.dmi' diff --git a/modular_doppler/modular_uplink/code/dangerous_gear.dm b/modular_doppler/modular_uplink/code/dangerous_gear.dm new file mode 100644 index 00000000000000..447b117cfe453f --- /dev/null +++ b/modular_doppler/modular_uplink/code/dangerous_gear.dm @@ -0,0 +1,8 @@ +/datum/uplink_item/dangerous/bolt_thrower + name = "\improper Tiziran Bolt Thrower" + desc = "Gauss firearms are popular for Tiziran operators owing to the perception that a slug driven without \ + sparks is safer in potentially gaseous subterranean tunnels. Unfortunately it is also popular to overclock the \ + drivers and fire bolts with sufficient velocity to create explosive cavitation in the air anyway." + item = /obj/item/gun/ballistic/bolt_thrower + cost = 13 + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS) diff --git a/modular_doppler/modular_uplink/code/suits.dm b/modular_doppler/modular_uplink/code/suits.dm index 91e36755c271cc..c3e9d57e77e246 100644 --- a/modular_doppler/modular_uplink/code/suits.dm +++ b/modular_doppler/modular_uplink/code/suits.dm @@ -12,3 +12,9 @@ /datum/uplink_item/suits/modsuit/elite_traitor surplus = 40 + +/datum/uplink_item/suits/tiziran + name = "\improper Tiziran EVA suit" + desc = "A relatively affordable suit originally issued to Imperial Tiziran forces. The wide availability \ + of surplus units has led to their broad adoption by irregular Tiziran forces and even criminal enterprise." + item = /obj/item/clothing/suit/space/pirate/tiziran diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index b5c9bf92ee0bf1..2a88ed51d46731 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -4,7 +4,7 @@ */ /obj/item/gun/ballistic/bolt_thrower - name = "bolt thrower" + name = "\improper Tiziran bolt thrower" desc = "Tiziran small arms often feature electromagnetic drivers in lieu of propellant in an effort to prevent \ errant sparks from igniting low lying puddles of subterranean gasses. This effort is often rendered fruitless \ when field operators overtune their coils for greater penetration until the projectile spall itself ignites." diff --git a/tgstation.dme b/tgstation.dme index 28ef342746ede0..73feae2fbab62d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7553,6 +7553,7 @@ #include "modular_doppler\modular_species\species_types\viridian\organs\pod_hair.dm" #include "modular_doppler\modular_species\species_types\viridian\organs\stomach.dm" #include "modular_doppler\modular_uplink\code\ammunition.dm" +#include "modular_doppler\modular_uplink\code\dangerous_gear.dm" #include "modular_doppler\modular_uplink\code\kit_special.dm" #include "modular_doppler\modular_uplink\code\kit_tactical.dm" #include "modular_doppler\modular_uplink\code\smallerpizzabomb.dm" From b6e580afa745c62813f8edc7f1e4259e69500edb Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 4 Jan 2026 04:01:31 -0800 Subject: [PATCH 29/38] fixes a broken cyclelink obnoxiously --- .../pirate_tiziran_raider_shuttle.dmm | 46 +++++++++++------ .../~doppler_shuttles/tiziran_corvette.dmm | 51 ++++++++++++------- .../pirates/tiziran_raiders.dm | 2 +- 3 files changed, 64 insertions(+), 35 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm index 3606fc3a140c69..649da5205ce765 100644 --- a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm @@ -14,8 +14,23 @@ "bB" = ( /obj/structure/cable, /obj/machinery/light/red/directional/west, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") + }, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/pirate/tiziran_corvette) +"ce" = ( +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate/tiziran_corvette) "cv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -122,14 +137,10 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "kd" = ( -/obj/machinery/door/airlock/external{ - id_tag = "pirateforeexternal"; - req_access = list("syndicate") - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "kf" = ( /obj/machinery/door/airlock/external{ @@ -448,6 +459,12 @@ "BS" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/pirate/tiziran_corvette) +"CE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate/tiziran_corvette) "Dl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -779,12 +796,9 @@ /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "Yq" = ( -/obj/machinery/door/airlock/hatch{ - req_access = list("syndicate") - }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "ZK" = ( @@ -942,10 +956,10 @@ IS qc Ti In +CE nt Ja Ja -Ja TK MZ MZ @@ -966,8 +980,8 @@ IS qc zv In -SG -Ja +kd +Yq bB yj kf @@ -990,9 +1004,9 @@ qc Ja Ja Ja -Yq Ja -kd +ce +Ja Ja BS vw diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index 92be482ac2e75e..154b83282c824e 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -51,12 +51,9 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "bD" = ( -/obj/machinery/door/airlock/hatch{ - req_access = list("syndicate") - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "cb" = ( @@ -215,9 +212,21 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_corvette) +"jM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "jW" = ( /obj/structure/cable, /obj/machinery/light/red/directional/west, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external{ + id_tag = "pirateforeexternal"; + req_access = list("syndicate") + }, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_corvette) "le" = ( @@ -318,6 +327,7 @@ /area/shuttle/personally_bought/tiziran_corvette) "rH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "rO" = ( @@ -422,6 +432,15 @@ /obj/machinery/light/red/directional/south, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) +"yy" = ( +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/hatch{ + req_access = list("syndicate") + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/personally_bought/tiziran_corvette) "yQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -742,14 +761,10 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "UY" = ( -/obj/machinery/door/airlock/external{ - id_tag = "pirateforeexternal"; - req_access = list("syndicate") - }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron/dark/textured, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "WH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -915,7 +930,7 @@ xT KJ lh AW -DA +bD Rm hi TS @@ -939,10 +954,10 @@ fc Bj pb hq +bD DA lh lh -lh Hp xT xT @@ -963,8 +978,8 @@ fc Bj aN hq -hQ -lh +jM +UY jW sy ab @@ -987,9 +1002,9 @@ Bj lh lh lh -bD lh -UY +yy +lh lh nl wt @@ -1012,7 +1027,7 @@ GK gz lh Rm -fO +UY Ql rl Tc diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index 4feaa3ec3c96a5..96177878cdfceb 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -43,7 +43,7 @@ rank = "swabbie" icon_state = "oldpod" base_icon_state = "oldpod" - fluff_spawn = /obj/structure/showcase/machinery/tiziran_pod + fluff_spawn = /obj/structure/showcase/machinery/empty_tiziran_pod /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/create(mob/mob_possessor, newname) . = ..() From e8b876598b20e73a3da6565532e8d50ae8a95bfa Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Thu, 8 Jan 2026 21:32:23 -0800 Subject: [PATCH 30/38] fixes all problems forever --- .../pirate_tiziran_raider_shuttle.dmm | 55 +++++++++++++++++-- .../~doppler_shuttles/tiziran_corvette.dmm | 55 +++++++++++++++++-- 2 files changed, 102 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm index 649da5205ce765..4fb741dbebdf80 100644 --- a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm @@ -169,6 +169,7 @@ "lr" = ( /obj/machinery/light/red/directional/east, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/item/storage/box/monkeycubes/random, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "lS" = ( @@ -232,7 +233,28 @@ /area/shuttle/pirate/tiziran_corvette) "oF" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/chem_dispenser/frontier_appliance, +/obj/item/plate/copper{ + pixel_x = 9 + }, +/obj/item/plate/copper{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/plate/copper{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_y = 2; + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_x = -6; + pixel_y = 4 + }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "pk" = ( @@ -514,6 +536,10 @@ /obj/structure/girder/reinforced, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"Gn" = ( +/obj/machinery/biogenerator/organic_printer, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "GE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -547,7 +573,17 @@ /turf/open/floor/iron/dark, /area/shuttle/pirate/tiziran_corvette) "Il" = ( -/obj/machinery/oven/range_frontier, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/burner_plate{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/soup_pot/lizard{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/kitchen/spoon/soup_ladle/copper{ + pixel_x = 8 + }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "In" = ( @@ -628,6 +664,13 @@ /area/shuttle/pirate/tiziran_corvette) "Je" = ( /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/knife/lizard_kitchen{ + pixel_x = -5 + }, +/obj/item/kitchen/rollingpin/press{ + pixel_x = 6; + pixel_y = 3 + }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "JW" = ( @@ -763,6 +806,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) +"Vl" = ( +/obj/machinery/chem_dispenser/spice_machine, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "VT" = ( /obj/structure/cable, /obj/structure/marker_beacon/burgundy, @@ -1271,7 +1318,7 @@ Rf In Vi In -In +Vl Ja BS MZ @@ -1296,7 +1343,7 @@ MV AT SG SG -In +Gn Ja BS BS diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index 154b83282c824e..340e680ab78dde 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -96,7 +96,28 @@ /area/shuttle/personally_bought/tiziran_corvette) "er" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/chem_dispenser/frontier_appliance, +/obj/item/plate/copper{ + pixel_x = 9 + }, +/obj/item/plate/copper{ + pixel_x = 9; + pixel_y = 2 + }, +/obj/item/plate/copper{ + pixel_x = 9; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_y = 2; + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bowl/copper{ + pixel_x = -6; + pixel_y = 4 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "eI" = ( @@ -171,6 +192,10 @@ "hq" = ( /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) +"ht" = ( +/obj/machinery/chem_dispenser/spice_machine, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "hC" = ( /obj/machinery/door/airlock/hatch, /obj/structure/cable, @@ -248,7 +273,21 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_corvette) "mb" = ( -/obj/machinery/oven/range_frontier, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/burner_plate{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/soup_pot/lizard{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/kitchen/spoon/soup_ladle/copper{ + pixel_x = 8 + }, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) +"mk" = ( +/obj/machinery/biogenerator/organic_printer, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "mZ" = ( @@ -398,6 +437,7 @@ "wu" = ( /obj/machinery/light/red/directional/east, /obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/item/storage/box/monkeycubes/random, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "wP" = ( @@ -719,6 +759,13 @@ /area/shuttle/personally_bought/tiziran_corvette) "Re" = ( /obj/structure/table/reinforced/plastitaniumglass, +/obj/item/knife/lizard_kitchen{ + pixel_x = -5 + }, +/obj/item/kitchen/rollingpin/press{ + pixel_x = 6; + pixel_y = 3 + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "Rm" = ( @@ -1269,7 +1316,7 @@ gi hq Rm hq -hq +ht lh nl xT @@ -1294,7 +1341,7 @@ hD af hQ hQ -hq +mk lh nl nl From 9cad4233ec00aece9ef0294d3b4e51bb9150efc5 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:00:47 -0800 Subject: [PATCH 31/38] one more attribution i forgor --- modular_doppler/modular_sounds/attributions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_doppler/modular_sounds/attributions.txt b/modular_doppler/modular_sounds/attributions.txt index 1e35702e8f7c4c..e5909f90ec474a 100644 --- a/modular_doppler/modular_sounds/attributions.txt +++ b/modular_doppler/modular_sounds/attributions.txt @@ -1 +1,2 @@ bolt_thrower.ogg - lentikula, "Sci-Fi Weapon Shots SFX", CC0 license +particle_cannon.ogg - lentikula, "Sci-Fi Weapon Shots SFX", CC0 license From 1289818ca04c89c7e15209a8cae1c6c87ec145cb Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sun, 25 Jan 2026 14:51:57 -0800 Subject: [PATCH 32/38] some fixes 2 the shuttles --- .../pirate_tiziran_raider_shuttle.dmm | 42 ++++++++++++------- .../~doppler_shuttles/tiziran_corvette.dmm | 24 +++++++---- 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm index 4fb741dbebdf80..ae2f7402a6370d 100644 --- a/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm +++ b/_maps/shuttles/~doppler_shuttles/pirate_tiziran_raider_shuttle.dmm @@ -78,6 +78,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "eq" = ( @@ -100,6 +101,7 @@ /obj/structure/chair/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/marker_beacon/burgundy, +/obj/machinery/holopad, /turf/open/floor/iron/dark/smooth_half, /area/shuttle/pirate/tiziran_corvette) "fA" = ( @@ -132,6 +134,10 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) +"ic" = ( +/obj/machinery/porta_turret/syndicate, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/shuttle/pirate/tiziran_corvette) "jl" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/iron_dark, @@ -152,6 +158,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/pirate/tiziran_corvette) "kC" = ( @@ -196,6 +203,10 @@ /obj/structure/kitchenspike, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"mA" = ( +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "mJ" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/tile/red/half{ @@ -319,6 +330,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/light/red/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/pirate/tiziran_corvette) "tX" = ( @@ -344,9 +356,7 @@ req_access = list("syndicate") }, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "wq" = ( @@ -597,9 +607,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "IB" = ( @@ -614,7 +621,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate/tiziran_corvette) "IS" = ( @@ -730,6 +736,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) +"QR" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/plating, +/area/shuttle/pirate/tiziran_corvette) "Ra" = ( /obj/machinery/computer/monitor{ dir = 1 @@ -746,6 +756,7 @@ /area/shuttle/pirate/tiziran_corvette) "Rm" = ( /obj/machinery/light/red/directional/west, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/shuttle/pirate/tiziran_corvette) "RO" = ( @@ -787,6 +798,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/red/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/shuttle/pirate/tiziran_corvette) "TK" = ( @@ -888,8 +900,8 @@ BS Ja LG Ja -In -In +mA +QR Ja BS BS @@ -1007,7 +1019,7 @@ CE nt Ja Ja -TK +ic MZ MZ MZ @@ -1055,7 +1067,7 @@ Ja ce Ja Ja -BS +Ja vw MZ MZ @@ -1076,7 +1088,7 @@ GI NK Ja Vi -zh +Vi VT Ra QC @@ -1247,7 +1259,7 @@ Ja Vi jl Ja -BS +Ja MZ MZ MZ @@ -1270,7 +1282,7 @@ Dv Ja wq Ja -BS +Ja tX MZ MZ @@ -1295,7 +1307,7 @@ Mp Vi In Ja -TK +ic MZ MZ MZ diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm index 340e680ab78dde..c72126091edf0d 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_corvette.dmm @@ -9,6 +9,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark/airless, /area/shuttle/personally_bought/tiziran_corvette) "af" = ( @@ -68,9 +69,7 @@ req_access = list("syndicate") }, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "cL" = ( @@ -128,9 +127,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) "fc" = ( @@ -217,7 +213,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/cutaiwire, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "hQ" = ( @@ -305,6 +300,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_corvette) +"oe" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "oO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -605,6 +604,7 @@ /obj/docking_port/mobile/personally_bought{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "CY" = ( @@ -632,6 +632,10 @@ }, /turf/open/floor/iron/dark, /area/shuttle/personally_bought/tiziran_corvette) +"ER" = ( +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/shuttle/personally_bought/tiziran_corvette) "Fy" = ( /obj/structure/railing/eva_handhold/directional/east, /turf/closed/wall/mineral/plastitanium, @@ -732,6 +736,7 @@ /obj/structure/chair/bronze, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/marker_beacon/burgundy, +/obj/machinery/holopad, /turf/open/floor/iron/dark/smooth_half, /area/shuttle/personally_bought/tiziran_corvette) "Ql" = ( @@ -748,6 +753,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/structure/tizirian_radiator, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/personally_bought/tiziran_corvette) "QV" = ( @@ -886,8 +892,8 @@ nl lh xz lh -hq -hq +ER +oe lh nl nl From e6b3d865e803418bf7175fe20e096eb1c65a951f Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 26 Jan 2026 01:45:48 -0800 Subject: [PATCH 33/38] fixes the interceptor, adds a two hander for the pirate captain --- .../~doppler_shuttles/tiziran_interceptor.dmm | 19 ++++++----------- .../pirates/tiziran_raiders.dm | 6 ++++++ .../species_clothes/code/tiziria/items.dm | 20 ++++++++++++++++++ .../species_clothes/icons/tiziria/gear48x.dmi | Bin 0 -> 664 bytes .../icons/tiziria/gear_worn.dmi | Bin 10342 -> 10810 bytes .../icons/tiziria/lefthand.dmi | Bin 971 -> 1342 bytes .../icons/tiziria/righthand.dmi | Bin 987 -> 1391 bytes 7 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 modular_doppler/species_clothes/icons/tiziria/gear48x.dmi diff --git a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm index 26f82ea0975f69..93ddf4dbd22872 100644 --- a/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm +++ b/_maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm @@ -83,14 +83,6 @@ "o" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/personally_bought/tiziran_interceptor) -"p" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "interceptor" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/personally_bought/tiziran_interceptor) "q" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/wall_healer/free/directional/west, @@ -269,7 +261,8 @@ /area/shuttle/personally_bought/tiziran_interceptor) "U" = ( /obj/machinery/turretid{ - pixel_y = -24 + pixel_y = -24; + req_access = list("syndicate") }, /obj/machinery/button/door{ id = "interceptor"; @@ -284,11 +277,11 @@ /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "V" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "interceptor" + }, /turf/open/floor/plating, /area/shuttle/personally_bought/tiziran_interceptor) "W" = ( @@ -375,7 +368,7 @@ a V z e -p +V a a "} diff --git a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm index 96177878cdfceb..5ee34c89de3e0c 100644 --- a/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm +++ b/modular_doppler/modular_antagonists/pirates/tiziran_raiders.dm @@ -32,6 +32,11 @@ shoes = /obj/item/clothing/shoes/lizard_shins belt = /obj/item/storage/belt/lizard_sabre +/datum/outfit/pirate/tiziran/captain + belt = null + r_hand = /obj/item/melee/tizirian_sword/megachoppa + + /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran name = "\improper Tiziran sleeper" desc = "A cryogenic stasis bed for long term space travel. Tizirans find the brief window of consciousness before hypersleep spares them the \ @@ -53,6 +58,7 @@ /obj/effect/mob_spawn/ghost_role/human/pirate/tiziran/captain name = "\improper Tiziran command sleeper" rank = "captain" + outfit = /datum/outfit/pirate/tiziran/captain /obj/structure/showcase/machinery/empty_tiziran_pod name = "empty sleeper pod" diff --git a/modular_doppler/species_clothes/code/tiziria/items.dm b/modular_doppler/species_clothes/code/tiziria/items.dm index fca9993cb9d95e..58939718069797 100644 --- a/modular_doppler/species_clothes/code/tiziria/items.dm +++ b/modular_doppler/species_clothes/code/tiziria/items.dm @@ -129,3 +129,23 @@ exposed_wound_bonus = 0 attack_verb_continuous = list("bonks", "bops", "bashes", "slaps", "thumps", "thwacks", "wallops", "biffs") attack_verb_simple = list("bonk", "bop", "bash", "slap", "thump", "thwack", "wallop", "biff") + +/obj/item/melee/tizirian_sword/megachoppa // a special variant for the raider captain, thus it's roughly one esword in strength + name = "\improper Tizirian great sword" + desc = "A rare variation of the utilitarian Tiziran sabre, this design relies on the cutting edge of bronze metallurgy \ + to achieve such a lengthy blade. Exotic amendments to its constiuent alloys allow for keener edge and help alleviate a rare \ + phenomena where clashed blades in near vacuum can contact weld to one another." + icon = 'modular_doppler/species_clothes/icons/tiziria/gear48x.dmi' + icon_state = "megachoppa" + worn_icon_state = "megachoppa" + inhand_icon_state = "megachoppa" + force = 30 + throwforce = 20 + armour_penetration = 35 + block_chance = 50 + exposed_wound_bonus = 30 + demolition_mod = 1.5 + +/obj/item/melee/tizirian_sword/megachoppa/Initialize(mapload) + . = ..() + AddComponent(/datum/component/two_handed, require_twohands = TRUE, icon_wielded = "megachoppa") diff --git a/modular_doppler/species_clothes/icons/tiziria/gear48x.dmi b/modular_doppler/species_clothes/icons/tiziria/gear48x.dmi new file mode 100644 index 0000000000000000000000000000000000000000..32ba8fd0dfdf429efc77ee8103e1f743ac32d0a4 GIT binary patch literal 664 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 LzF1>+>+$~pAXK|P literal 10342 zcmcI~cT^MWyY(OAS5JM(I8C_R7xn) zqzM9{$3o}Ok&+Oip_hQ6B@mL_@VoU}zpvc;$2V)`U2A4N^Uh@E-Osb1z2~L1rK#{i z>4N|O2w%T;^(FxDMe=@k_wVB!sd!SV$J-GLw{r}>dN0U5@cx6~`~GkMc$oGksS)0M z{7~fVZ}EPz>xMt=Cb_UKi*d01q)29bWaQM4e#8NLo!|m8-vKjuocg|4+Ts>15N5R^ zRqkd!+)FcKp+eQ(r_w&3`8t^6eaH#68XAAWl=*o zJNi|@^}fh8-Fv6TI#H~+kQ{BF7m0C|f%Df-^QT*=9cDFK-_AE!>m>hWSw-BEnBM{I zO%fZp>j4k$ilB&rXyzQ?mn*_Z25&RJ-Ke4)?xma!tl$G@rt3@+a| z^-b9SNX#p0fxX`m&4-J{g}|{7Z^o+ep0yUY%Ce_TUuwdb>g~s^)HLOko@7- zRM4p3p5V$cjZX3wXa>Xjn-1!Y2+NpF3+iPky5LwB^ts%Ko<{DhcCQ{I<0K#N%~^wj zRxJU8+Cxx`3+%z~kK45V{@Fx+D~MQ0vT{>$=auqPo;!Xbf2fF30%ogI+lP^wKg936 z^dn%r)?-huFvo-y%2)e>@QY!Md?8Cj7jO;6zrv?`+oQ`xCI^q1p!?q;Xp;9~{oSUs zX5k}0_N`7$MA*1F)1ggN?2=K{(Xy|8DAhPww6+sUOE4POZNz2vw3KKG6ZK5`{vV`cigHU zVJSa5e^oLg<`T+`DI7RTwd82qtFlpO4aQ5FavuJdh_U+6jDN&rxkg@~_4#t*&#A&& zi%&#yNOgpRbTYN9MijEHs%A(vmZg%Im{^BAg&wtGvvO+_1)iUuzaBoTb}cqWU*=p>HGB1xN}^($$SE1P z(=7sYqkUPFE&U+6cp*09Gx4ffKZ2ef)woQ)Ea`lyud+_6Z$Lc$wRO48q!mf{9qPy& zT2C&J-<$35+kUBd)XDVEGv272n(+Q(E%=&5nd8^Y@t@?cV2~ zeG(W6))Om8itAN80&@Z4=cj_EHgU(>l<-DY<|zE z8wnVN;XJE`_#CYgC39H$kh~0=xTtYJ5^BZ}_&FiJEpQhHR!*)LJgftE&}^EP9I#7( zUG5wbe<~+BCc=xt1NDrk36ag(CvLS!pd63c4SEf(>(-}COiaAjlhZ*<_nrx<<2HAQ zU7ur)jXFfSw;;~sQJqC-K3hgV-^~!yY#v%Kdz0o`ype+HRMLg!J5ca=n&Id9WD|z7 zf(QtcN0V1+QvED&Sq*NfP)N?tGsutl>AgnH%9qctW`S)ZEq~dn51neAz=1d1@Kua- zSYmu} z47>;$40iDAs7B;y9w@Xyu5ko;c>W)6nTR0bmX%g1)Y-YpGlISOm5of~y)a*27h3Dc zO>O1s=2y7xD{j*Xx9*Jm-rxaPuyDq=H^0s~3Fyzv7$xdl%m_lUx6q2QE_Elnuw2PIB5ift5_S zh$JL6ibGG2c4o>{Mo4S5uFbM3E-Tz*aHNC0gYKZ55a6=Do&|A>{u@M5tQE<;DmCEd#cK0kx1`>p>Y zcH+Pko6`kG;~Tlo+molBboosBr&*ppefo7brn-dVA-_$n{*a%qG@nj5uC2N4_ett5 z6bglHy?)b?;2!llCKW%lLSgsCHZRM|$V68NoeuAx*DkWC6nBxLgw56Z&bOA2^51fG z<<`f8BJ0^)W-O#ws=jP#D`cHU_?3s)V97`9y!0kfOsLtG`TI!(O#ioS%CjZlAvcu5 zB24Q6FcfTwfSyX7Hx71YD6KiWIQuSjL~DlUv?ZL(4k%PLJb;b|-`1}1ad;m$4MnpG=a)~!Xn@e9Mhu?DRd zapm+cQdT>OOBF(9H*5M~stIv4%0Pj=v1>hg%!&IXQX7^jo#c2N(Su7s!D| zmKU8&)>o|pORrtq@9Q7)xT5x{A3qFZ!S;yTE)NT^5U>wm`RbgVNw6NCAPQj{*$$ez`JrW164|31Czde~OjQ^ol2U4jXjqcO%NsO1S3f0WFwnJ4o z#)3d)VOd$3iHP#&+AyWaz(Aqi(NV|s-q)+KqQU$+K&5%hh-%#!i7ZDkH#ctn z?P|`KbqZeoV`F!jHm*rseTTJvWzyn`FZxr$jaFiI1h;aF>*vy!W>`kRjv`D*;Yj45 zmWP#tx~O+eLiIFNKM8p5080zk~$%pQA=`>I(tc)O9DW5;kKN?VALb0 zul)lisb`ea!rMnBN8B90UedgPJJ)n2$a?%7-rXTKD+uTVyo~Dzt3HLQ6Hv3gm)-Ib4;y< zM9OT?zPbap1~6|slzS(*sZc&Dy}3)#dFKs3P?db z-{=9ELG~1W@A*IbOj>T4$sCB{gojViKQADG9xp!iPlCXgsAQeU`%sAgpAtv5qY77J zak)nbq+=~ixyP(y1_@|MK7%c5UBFJ#)&PjSkGy}oNZ?=4{JPx`|>oB~t$jj`<=Hv?~4363CsZA~CM2kz%mR`5T z3i?Gbs`x@pFN|}wZhcH7>?WVw9ql^=z1uH(M>)|c!lyU2wvo{E$d=*hY6{CmzUa`h z5M#wWrMr?J1RS)=@ecq$;;}ZXdJe~IBzJ^IbZa?`^a^Sj!l#y(`laoWw?maXZO+ZY z=k{uBOX9`a;TQyPA$-n&y#l`10$m&moSaep&#*BaJ{=(Gu>?XDriBWe*LMx#_Jo>K z7DaMjX={DQ)+NVObEnvs7%Ql@^~Pmur|#N$(MP*!`8{;NcqBFAZ>ebY!EG<3Zd_X3 zr4TtkG-ZTRCFYFd6HlK$nhjd@SYtJDO4CQT4`t4sYx5*!&Fe*GWMo`jgI~x`UOik7-xn@5LjQ$_d5}=>7#N{stC*+vsEYk zt-4J4ruF&GGx)1O(#=6oWXuEDx*n~(gEV~Rsq_I-_~8Axj)%!lT*|Dj7)!sLJrd-! zV~zw2if%w4FM9qIu!iwg{bc^}|81&|JVDJrZtW!B=yRK9Bo%QojK0B5nBaU}>s<{m zjfd2P1i&_^VI85+hu}uG76tQ&M#+YDfccW54le(u#`)I=jir-@UD-&|40N3X3&OC+ zVbPKDz(%Pq(>z}hh|Q8 zPOmeIzEbPqE*tNNQ7kk#g5x8msy5%K;k2V$@RKvYz=4TkLVi_S5C{)QR3RxiICNQn zgm(XBuuj9!PD%OM(&e2JP8O9$gkE5Htym^?(MMe41~||r_xmum=|tG>eB5p%GN*;{ z%+@gb%-M%$t5?~B5c3qx)z~fH50Z;o=!h$NP0Cs>r@_yNih|q|qt~oycjvv9Pt{a0wR=4y{S3yS)y*KQ|l9yYC6>E>Fo{d<6z&yW?a zX8#b8Tmh{#hcd3Z{jOq<-TPK-w{ACXH}wk6ox**WNb~f*S`d3YH3c3uw^thRSkl(b z^2*qj`~u{{?AGL(eV z1Jdkss8A2hKWNfBWy!p{Z@n4~$v{sCRrYkAX0 z19e)7-?0R83S+{$eh&CEXX*awk^(1sFH69G_Gz`H!Fa4e+*Xge^G^Nk5SFt|6&0F9 z^G}bg0bO}P!>Mxag$}od`LSH8+C&MjUAaAv@^1{*N1&L`*PkH=v0blI@yo04L)#Hj zF%m$kSEwl`jIiYb&p3TG<2|*1b+gF7sCkY;{4p~|PQWB&l%?h$NXXB7Sc&>s8s?(D zo$~oKdoX|54EMV!r|iwg(ZWfm`t{fA+X7nSiAJfONB^>QLKQ+bCzV_S!ok!u^l@H5*?E7Ot1K;w21PwYz8d3(F*W2<=FJxe z?|gptgI#Y4&NT7#O^k1;>8~TJJ%0MI2{>zRduZ(b^TXWy0{WUGrU;wND{24jEx1rS zOsVgs%t%>DiPL9&ZJxLh&gy7n-C(0Szx3$oYHDiE`Z1oxQh160yD2f>)xxbszKK&u z{Q1+qV{UG3qo&-gemuyaNcCL)uBM_9m+i;p_5Nj)P-^bv^}ju~ zAOTUeXKIdDmZG^iagYSbEDU}Q`r2wmTY6~=vlW|LC1}dI6|N@(O)`45r{J=~P6@Mf zlND+*w&}bwmIN2Xi&dloZ(X{K5?;J z+kc&9j)AKtP#x)bs*3Y6@o3{_P1sy`5eWlVxk7gHJ@Dcn=A5J%D6&OrImWGij2o8yI=bKT#GMj-cg5l3UMEv(9G#VDwyPz*NC%=p0^9vzR;zU?H`f1rRV zT5|2R{6?vn5L&ZIXYaJuJ5$wQ1+K^0CqUU^ec>sb)!B})#Ai?ehzt~D_=-V5{ok6OrbFBkWjr$73D&PJQ zwC-OYS#A1(3Q<>2coi3i?7d=aYTUc=+lcZp4rTxFUO!W7U^>q~Z4q&@lnI7xsm*WL zHsZ{q%Md1KpLc!_{4{PT?p9Tc(AeA|>l(&=Q596#mSjatLaq&I^U`HA%k?cb7Mroy zyE0~np^PEjsJ2@9UEJXQXRZ_>ESDz?U2dFM`_VSQ$UvBEqC*8eI#rvIHZXrsj2=cS z?&wBeNth(7#9ueLASfwkwxKAu@l%i|>xoGVq22E!ToHk*biGs~fkF1)CXJpCJQSWa zALzF}ww}GHfF)RH74#L%9aAxY|FWlda3D}RdBged!Xp@V^{Q=#{$%}lFKArEhK?Ym zCm%Fc7w>|Fs&FVfthmz{#KN62`clM)kp^r=`JO3BR|(t_cTIxgLTE{orjPimK#=~= zA9Cw);2Kaib+H<(DuH!VP9`lo>_8hfs;7_y?XujBZX%z?SoynSdf9zmiVg*k8WM5YaCyycgDMkWk-^jdf2H5Q6{8&z^^5zo{-{P}Vn#ph-L z1C!G$OSV*M75~)oN#r)399#b5(e`a2hY)N_I`Xw{KE`~r0MNQcsrOip`Z;zcvmyVx z;efdLrjeD(Rfh+`^|Lf?qATt#LvF>^pn6%fMEWBI*R8M~^>s`!(yw`C=E(M%AZ^S8 z$A}g*ef=YP_7r4+?H#Z9XuYl%J$JwAO9T&j7^Y1)n=FsQG0q%!X4Lii760=bsR`u| zSDT?rmJVqcbl`-NKYYvJ?QJliN{(^;K=pS6NqgGrZYsnFBk6+HHfM`NUTPD_2eiBx zj<<0`LPdIpCG!8TTo^2d{w`PW=|5Xo!h)yXsgpn^xStO&F#c~0-Q8e5zX*UZhunKl{B&Cm9%&PtUYI%adHRMRkSWgV!3(QVEfQYi{tOFA0+E-g z!c}_49`Z!ll5dijcbz4hwcR-HI*U1g$An{iN@_sbJFAt8n-2>f8lUHwXj_H=^R8wW zVTQcfH0=6<`|YA6v?$Loc|26!@M@3x0^BfqHkx;N{9eHxTB}O51Mw-(y~xcz0@rF= zv{Tut;GJhzVGB{nk8~@BJoOCn6a@^kl-@gX!rF7O!#9WiZ41F!Hc3XB3J` za`ga-G-0h0vlIehp49Q3q5lpwO^|yRg1H8ljrayjairhNWBLeIUH8WR1)C@kHoWT-p_I*qTeXBxao(DJ2PClLcMuOataR~gHmoRIgCKE1+pTU)x= z5_dmO)-d9zXAZPO62#zG5B?d}CY9=iJA*dAIQ5*uTGCjc zs=eSYeIW8|l8eiD*6C;{jOW)h!qWU2AOtVlETIKEc$L~X;i6+I5O(`QO|fPl#({Hw>J@WL(M;lu5wK!t-chBhN`zh`1&x%!Y)yX(?CoJr>%X6JW z8dKXw-lt|OU>K%-HLc7Dq{P#NdEM~I`a_7L-t8MveK&e?N&IgMnZCz#G9r{R+bcjP z`z$=qa-5#WdQlE2SNI8Prw-8gzNl4Ws><0#CA@nB0LUC*eQ?_$@BBsD^F=f(^>F!M z*%)I}5`EA>+sSzWYK})z8igEOs<< zlWzRyLx}~i7i*lb$%aDDSDfB!$V;BvEAgnPYq zOV9Uv^a$M3=HV2^T35Z8kIAvXs{xfmd~?F1gM*2#c(Dg0ZzIOaXcc%)X2=B-4j(Oy zPKCBJv&G;A$H!i3tv4W~o8IP>R*qV=R>Bgx&!}zF!lr+*wB}%q(JV;3ZZ*5~j?Sa( zU_&plkNhSKpY52140-$6yH!-hv$|)miJ~_aJLaqlP1p&G?`v^!VUYSl73GGu!GVpA7rzKH(y$AdhUHW+ftb;)N%rP<*%o$#sN3a{q!mdS^ zQ85p=6I0D*ZG%jQxs94Y>z&|WU5Y;{g)}xQ9zUJWa{s%LxK_o?uC`ISTWb-!=gDk> z7ENHh0U?#+lF4t;_(&s{ik_R7bX=4j_!c}pJ&%yMkE_p~7atm`qlB}&x7lN|>tm7A zN8N5+)?4*js3pycjOiMpImd~gJM>r9&g(#K^IWXekvP=F19Szy1o2;=flTM$`wRyz8(?gl2Ho4$MT8F(>I|9L~TO!09f{EHlLBdReHHJX4hW~FuL zrzZB{z9M9JikqD2-j-i-s0S2Uk?#VktTw3km}%QH# zv1oS*0~tEe>IA9xL>m^z*7n5ze$F{F=XWTY($Q=5na7FFXs#yF>2&S7(p-4kQ32ba#m3Shnxk{5+9%%>sF`z^cCp^ zQruE*_0{uEWmKg7gz|a1jBuZ?F`r>^%hw7Zm^bFt%4(yS=80Sa7 zC1L<4vJVC-Etwrxch^+$fQMBglJovbdICaBPLvv=ZfV9j27K<-bGQ>MuZ9H1$~>ba z!LBNXv&pkTx4xF!N21*WqLuC7ju^+OQhqohlr%h&xy*F`^Ib`79rc8d+Yf*HVOsCLgICCkVx#}`iH&7FZ&CRnkv1?0s%=+QgR|S_B77zKrKwa z_Ohoz6OcoL+m)^*&;aaZs(tLX_4)NA^SSDM)}V=|1AY*RyM&k2#FDahNU+33d^}7z zQ>OtVHj2(~9%&yMp5$;2O#G@Z;j@b#q3o$hC@f`3zpEnzI}Y^|ntN1t?>IS=ATTuF zo|FJv^Hu>$4zBuUHlg1q<7(1Du)UcsuKB7Jv*$L{RsV2HCr5_te#ip=-R?x-AB|dr ztwHQ%#iM|oI0*PZ4h;tbZpvDs`JY}91j?4|((m2&|J*rnpyjd(s7??BG?ectT+?8A zEOylcv*ZJpat>){U*;vshMNf@0iBj5jEb)FW~KGZbyI6NE^2+Ggj!Vd@#0zPnd`af zvRkJgR7tEpJLFMv`*U6%71Mobkn%O!;R6)>fUNU-+5(R&p<9~Z|;c{L5%Y?b6#5(sL5=J zpT%dR6h28t@ohA@A}QJ+Q6at85td)6E#8Y2eRsdO?D4kX>0~i}_CGZvmKMVK z9Qb7CH`hC{T-)w>4^hz+s=A5H{+MfRBKa|9O?)gtE2CLnMBeX%;OC*{n{7+G~Zh5G_O ze$k@uZt}j~QJ!V})^&y^gfiS`BrAC9GKztF+;`*{)z`ykv3!FH-P(<&Ml>(1{nnMx zbhb(`<%a#Tz7~w_1wN{_`}1w-=*E5D@idj;^G+EN`NH@Wra1yz971gFnfRI&59k>8 l17}~I$@G~-{Rc(l$|v3I*LG3s&)8kN*NrW&mKxrD{4YLAj#~f# diff --git a/modular_doppler/species_clothes/icons/tiziria/lefthand.dmi b/modular_doppler/species_clothes/icons/tiziria/lefthand.dmi index 235fe0c32c3e0abfdf9cb7bd634ebf90a7302cc8..ace3abde866841f7c8026c03d5c7444b7e6ccefc 100644 GIT binary patch delta 1254 zcmX@jzK=__Gr-TCmrII^fq{Y7)59f*fq@aoWJus(1CpOUuIT_$H4{~{>Xp}MnVZ@Q z?r%KBwXRMtp`D50nxWz26|B?w85meBkEeixZR1&5h z6KHzY->PuYEr^rN=~9G;+yN(T-I|7kiR=PvntGcO6d7j=%norfXlzh2Q`9%OY5Xqs zcw+h8o$u~hKL7Riz@uGF#oy-Kzf(W=u5R8WkkfDhhd*ueZT(lTWBfI7vQ_4h0|y+e zOzo!KUA1mGPx$65@7c7zuU>bWX|?h9iRU}3bxQp5T5TdE)t4VX`PiL*^2_PX?-s5x zl)i0kzH0RodwYA<>uXMj>hp7-+0A;oL~UwM%el^5tPWBe|2!- zEO*OWY3~jP`Gx2+_^B@xxbz_Eadnt`ZA0e6@=)g9)@d_;Zwl`{k?GoV(+0r~Yo^1)y(CZ=8HtUua}u zF{7uiZ&&-KV>!9GEAJ+qY&8onE-EP4RvP-E_P*|<57D!C_NQ5{^i)+|SiGo=ae~{K zbLW;hJ3Ak>U&-xSxZvk3)2l1zE}i-N!VKZ9+zm74&p$tF)22;DnHo!WD$bf=@3*?~ z-TU|Ezz~v3e|Ojm8bTAEU6Z=^Ija7ZbBOhYhzwu=Yg-y_WUyH4v~l-t={;hStBy4u zbGv+|HsgHfO4b9JVqF1^6CUqam?e|3X4RaX{6#_?EJ|O(-HL21^G+l`iV-#b?&yaI z2du0cs=tqA-cPvf)Vo13WLn<0Uku^(Po+L4{Rl03pEv(jY}r!1mHw|%6dUxlEBT+@ zz5PA2?tIDG-^<0br|eq2hTW|7-0rTsUdxUhm+~)4u6B3zUD0>ic}?VnDc`;L-${M^ za`5f3WclUuRmzWvEt39of9_M0W6!VpURvz``o8r3`rm)`e@A}xyre7jIqu}WhNEsg zciwx~tGWN${QD=v5tVBorOK9yN1olg_*1?oUNGZa^@X;$YaOlU<9+xf?rydDt#($Q zrMvo6VM}%kPf1!~sIT&t zj6L=ta-Rh5IBnQwGJW1tx9?5~hVPe(F;q5vdZHIye^AHFiM#UXXU?5_qE4x9nl^di z?3lQ9y9B1Zy;ypp`sJaR;8~`dt}dVBRIR+lg8%1H{*I`<|8vdzBU;}CzNyszE2fa` zv{%#f-EW`7Le?v4|Ff>Y6E1wdYwjPVl>VgiyUQ2mrJlL`C$T+rt({=`y4xr3`*g@1 zo%Ma4iE5i$#&sQwCv*OYf8FK&WG`oCmr0!7@m1@dT1~L?-oKn{`eKXgr{#`L`~F|z W;Oy%h;V(@3yK~C6FqesG3!Oc%@h5!K>$4 zbF3Mh@2Ki-H2Im$z`!i%>EaktG3V{wjaed&66_yBYq+eN3#R%?1x^%cl92X3cuuX= zf5I`ZZkxt_g@{`c0xc{Dje0{Jl9qSy7p9rbERZSxxarQhGw=S?6{y^7o~>_uU;f>? zAKNm4)*^uiXX^Lv=3llmJHf%}a86E+&wSguD|SWKi$ym+3#iZe^P&3Pt~Q0QGw*wB z^boKA_b>0=oqbnr>Mc5_-{SrGaa~i%@!kD|kyPPDnZLo84diai{55{~ zk7M%5B{y%~>Y9Gb_V)ez`epS=0qI$Jef{U%#HUrQ^JGrw`}fM}@S8Vpe9XCQ zTMbjr-{d$Mh!H>z|DoevEPKHon zhE-||A-)VNW-$bq)-x{1!Y%`qSYQA&J2Zx&%}RKG_f5-RAEP9?{j4J2@o(_SXjypn z$onK<7#;g7xJg5c!Fg8a{i73}zvvGQWaRLg1LWLz2ILenc6fngz?_XxP6SBiBcoGC z(YYh<56S#Zl<;9#biqTBW#K`u+W+!%u3y{7dg;&8B7>>M(jr2k#0ciBL{Q4GJ0x0000DNk~Le000310001B2nGNE0P^vyhyVZpe32z; zeq^i_4!aj0eNxS9}h3&);vo1{1ov12Ja(c~Ws&Ak2R z-0)}bKm6b1OSreYyL(JuzkJ=xe!pP=^#W zvH_G6y?J$J_?)+3u154m}mhguuJAhEpky@^CEt1>L2e)JY(o1sn3a&8{x;ZTU}kCs%K`Jl;yE{eu{000HvlCU zk{Flh_V#wRva*s?q85c3uC1*dI4s4!Sl}f$>+?{10~jP{E>X*>42ycvTZnCkHZ|+H zS)YePUjisuONn|gZdkUqwxY$<6zjQJorl^RfEp5#wUnqQqlU%Gpd7?nZk?P5UF)bp zvE#tcLGk*pG%L9=4*&p@0|63~5CH{~5CH{$0OHU+-%`8*q6b!MYc=k!INsDBQj>o> zeJ1rn5ER;);0h&TFJ|+H=p;PaMtu`{W1{Fd0i9b!Jj>QCcAlcrhlATe_Jo` z>R=ZXHGTKfUjO**$M5~GR-2B)^Rgxm8vMu4|4lBB#{LUXm5QLZKq`oeqsFUHDw-ZD zV)44r1CKd1$@-cI@r8I5yK+!2%1OC@r8xZ3+9g1l3etOIFP=Wkf9{equHFVp`HZk0 zHJbEUTN9Jc_=@|^lV?f9IZ5m90LoM(?T{+iG`qjvMjrK9LVsVcQ|0$Yoe@w?tTi!h ze-*1@R_qprUy=)QfA|0O1Cw#rgP{?6zKt`(q}MB-5u|u+Yh_WSrp-0cwf;tUy95{~ z6j4o|^a*j$=I~4Zbq0%MR4iigtzgR9ToYaEZ}NeU`-C`XbNGwGnWD(Tr@kJvu_n6G zUo#1eYI>~U55gkxxG*d@>NP=s6Qs9+ZG7NYRrugYam9|MtB!I_c<=8IFBP{Zo;Lyg P00000NkvXXu0mjf$@pSO delta 887 zcmaFQb(>waGr-TCmrII^fq{Y7)59eQNFM;=1P(SJ>3yK~C6FqesG3!Oc%@h5!K>$4 zbF3Mh@2Ki-H2Im$z`(5N>EaktG3V{w{awO=BF8^Qe$;%!!@V-+Qb*SkfoZ+HOB2#3 zA5!;7Ug|pUfV;r9EjJrBOi+kewvo%@jmSsEV{`R_Gy3FPwss_ zPo78f-AN;$#YkYXKNEZXf_d!U<)7Zl&hVc8z3lAf&FVXAzEL@#5K)|90&EeS7-)`!)MqpRc|CTKMO`&)56k+>s1-MQEE^YKmQ`iv{g{#|Y_FZ=KP^MHxx<~_BQ^QLD~0}H}(EnlO%TfUKZSIbf=Wx^2`70 z*%sF5m6~uh9Ia$@-F*26qpUECWw$Rw*8XkN-4(cd<5gLge>`j@(sDGZ@bUE=5r*#1 zOiOO8`h*DLVoU3u>BXRIl*^ZF+&TEJM~bocMN)=I{g0h|pSh2N_=&TxCoj$)W&_P&n4 zv63+}n7`rjvAgdT4fPd#FR~oybbR&hyRw14LheP@0~6gQ33xOg{q;w`Yiq82W5&NP k1qsIr%{3AvAa4K5Ho5+;&(zsx#Xzy=>FVdQ&MBb@0Id0tHvj+t From 8fd8d61bbfddf07d17eb4c448b06895ecf201467 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Wed, 11 Feb 2026 16:58:12 -0800 Subject: [PATCH 34/38] Update ballistic.dm --- code/modules/projectiles/guns/ballistic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index b56ec58ca707ac..063afdeefe76ca 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -237,7 +237,7 @@ . += "[icon_state]_toy" //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || !mag_display || internal_magazine) //originally if(!magazine || internal_magazine || !mag_display) + if(!magazine || !mag_display || (internal_magazine && !mag_display)) //originally if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return From 37c4b54e0154cf9a783e1a4c22dbceec166e424d Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 14 Feb 2026 20:51:18 -0800 Subject: [PATCH 35/38] Update ballistic.dm --- code/modules/projectiles/guns/ballistic.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 063afdeefe76ca..d7e94957c73a66 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -236,8 +236,11 @@ if(gun_flags & TOY_FIREARM_OVERLAY) . += "[icon_state]_toy" - //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || !mag_display || (internal_magazine && !mag_display)) //originally if(!magazine || internal_magazine || !mag_display) + //BEGIN DOPPLER EDIT/ADDITION - allows guns with internal magazines to display them visually + // originally: if(!magazine || internal_magazine || !mag_display) + if(internal_magazine && mag_display) + . += "[icon_state]_mag" + else if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return From f521e9001878f87b2c3bd3faf090bd2eb587521e Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Sat, 14 Feb 2026 20:55:42 -0800 Subject: [PATCH 36/38] Revert "Update ballistic.dm" This reverts commit 37c4b54e0154cf9a783e1a4c22dbceec166e424d. --- code/modules/projectiles/guns/ballistic.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index d7e94957c73a66..063afdeefe76ca 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -236,11 +236,8 @@ if(gun_flags & TOY_FIREARM_OVERLAY) . += "[icon_state]_toy" - //BEGIN DOPPLER EDIT/ADDITION - allows guns with internal magazines to display them visually - // originally: if(!magazine || internal_magazine || !mag_display) - if(internal_magazine && mag_display) - . += "[icon_state]_mag" - else if(!magazine || internal_magazine || !mag_display) + //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually + if(!magazine || !mag_display || (internal_magazine && !mag_display)) //originally if(!magazine || internal_magazine || !mag_display) //END DOPPLER EDIT return From ae40b33466f38737193c0072a67461ea74a31e41 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 16 Feb 2026 13:30:32 -0800 Subject: [PATCH 37/38] hopefully finally fixes magazines for the bolters --- code/modules/projectiles/guns/ballistic.dm | 10 +++++++--- .../modular_weapons/code/guns/bolt_thrower.dm | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 063afdeefe76ca..c4d68e644910c1 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -141,6 +141,10 @@ /// If it has an icon for a selector switch indicating current firemode. var/selector_switch_icon = FALSE +/// DOPPLER EDIT ADDITION - allows a firearm with an internal magazine to display that magazine on the sprite + var/display_internal_magazine = FALSE +/// END DOPPLER EDIT + /obj/item/gun/ballistic/Initialize(mapload) . = ..() if(!spawn_magazine_type) @@ -236,9 +240,9 @@ if(gun_flags & TOY_FIREARM_OVERLAY) . += "[icon_state]_toy" - //BEGIN DOPPLER EDIT - allows guns with internal magazines to display them visually - if(!magazine || !mag_display || (internal_magazine && !mag_display)) //originally if(!magazine || internal_magazine || !mag_display) - //END DOPPLER EDIT +/// DOPPLER EDIT - allows firearms with internal magazines to display said magazine + if(!magazine || internal_magazine & !display_internal_magazine || !mag_display) ///was: if(!magazine || internal_magazine || !mag_display) +/// END DOPPLER EDIT return if(special_mags) diff --git a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm index 2a88ed51d46731..ed63deaa50149f 100644 --- a/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm +++ b/modular_doppler/modular_weapons/code/guns/bolt_thrower.dm @@ -18,6 +18,7 @@ slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bolt_thrower internal_magazine = TRUE + display_internal_magazine = TRUE mag_display = TRUE mag_display_ammo = TRUE fire_delay = 10 From e6f80394cda26188e8ec6a63ae76bc74ce486782 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Mon, 16 Feb 2026 13:47:21 -0800 Subject: [PATCH 38/38] Update bolt_shot.dm --- modular_doppler/modular_weapons/code/ammo/bolt_shot.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm index 96cad0168cc63f..256ddb25a35a4a 100644 --- a/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm +++ b/modular_doppler/modular_weapons/code/ammo/bolt_shot.dm @@ -10,6 +10,7 @@ icon_state = "machined_bolt" caliber = CALIBER_BOLT_THROWER projectile_type = /obj/projectile/bullet/bolt_slug + ammo_stack_type = /obj/item/ammo_box/magazine/ammo_stack/bolt_slug /obj/item/ammo_casing/bolt_slug/Initialize(mapload) . = ..()