diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index dabfb65f6d3..00f88d1306d 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -2115,11 +2115,11 @@ icon_state = "warningline_white"; dir = 1 }, -/obj/item/storage/toolbox/a762{ +/obj/item/storage/toolbox/ammobox/a762{ pixel_y = 16; pixel_x = 5 }, -/obj/item/storage/toolbox/a762{ +/obj/item/storage/toolbox/ammobox/a762{ pixel_y = 8; pixel_x = 3 }, diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm new file mode 100644 index 00000000000..7003d98d469 --- /dev/null +++ b/_maps/shuttles/pirate_irs.dmm @@ -0,0 +1,2532 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ac" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"af" = ( +/obj/structure/rack, +/obj/item/storage/box/flashbangs, +/obj/structure/window/reinforced/tinted/spawner/directional/south, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/item/grenade/smokebomb{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 9 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 2 + }, +/obj/item/grenade/smokebomb{ + pixel_x = -5 + }, +/obj/item/gun/grenadelauncher{ + pixel_y = 7 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"az" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/iv_drip, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"aC" = ( +/obj/machinery/porta_turret/syndicate/irs, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"aT" = ( +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"ba" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/item/storage/box/breacherslug, +/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"bo" = ( +/obj/structure/railing, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"bp" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/item/reagent_containers/cup/rag, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"bA" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/irs, +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"bO" = ( +/obj/machinery/door/window/brigdoor/right/directional/east{ + req_access = list("syndicate") + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/turretid{ + icon_state = "control_kill"; + lethal = 1; + locked = 0; + pixel_y = -24; + req_access = null + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"bT" = ( +/obj/structure/sink/kitchen/directional/east, +/obj/machinery/button/door/directional/south{ + id = "pirate_irs_bar"; + name = "Privacy Shutters" + }, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"bV" = ( +/obj/machinery/computer/shuttle/pirate, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"cL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "pirate_irs_bridge" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"cO" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"cV" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/ammobox/wt550m9{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/ammobox/wt550m9ap, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"dl" = ( +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/glass, +/area/shuttle/pirate) +"do" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/table/glass, +/obj/item/storage/box/masks{ + pixel_y = 6 + }, +/obj/item/stack/medical/bone_gel{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/storage/box/gloves, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"dC" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"dI" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"dP" = ( +/obj/effect/turf_decal/siding/dark_green, +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/structure/statue/gold/hop{ + name = "statue of the model tax collector" + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"eg" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ej" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ev" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"ew" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"fm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"fE" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 1 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"fO" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"gd" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/pirate) +"gl" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/machinery/recharger, +/turf/open/floor/iron, +/area/shuttle/pirate) +"gY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"hf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "pirate_irs_bar" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"hK" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"hO" = ( +/obj/structure/sign/departments/vault/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/end{ + dir = 8 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/shower/directional/south{ + layer = 4 + }, +/obj/effect/turf_decal/box, +/obj/structure/fluff{ + desc = "What, you think the water just magically soaks into the metallic flooring?"; + icon = 'icons/obj/lavaland/survival_pod.dmi'; + icon_state = "fan_tiny"; + name = "shower drain" + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"hS" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/irs/auditor{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"hW" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot/left, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ie" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 + }, +/obj/structure/table/glass, +/obj/item/clothing/neck/stethoscope, +/obj/item/storage/backpack/duffelbag/syndie/surgery, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"ig" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/red/dim/directional/south, +/obj/item/storage/bag/money/vault, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"ip" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_y = 6 + }, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"iZ" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/structure/rack, +/obj/item/electropack{ + pixel_x = 1 + }, +/obj/item/assembly/signaler{ + pixel_x = -8 + }, +/obj/effect/turf_decal/stripes/white{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, +/obj/item/melee/chainofcommand, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"jp" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"jX" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -9; + pixel_y = -4 + }, +/obj/item/stock_parts/cell/lead{ + pixel_y = -8; + pixel_x = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"kG" = ( +/obj/machinery/computer/apc_control, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/shuttle/pirate) +"kK" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/tinted/spawner/directional/east, +/obj/structure/window/reinforced/tinted/spawner/directional/south, +/obj/item/storage/toolbox/syndicate{ + pixel_y = -2 + }, +/obj/item/crowbar/power, +/obj/item/stack/sheet/mineral/sandbags{ + amount = 30 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"kO" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/glass, +/area/shuttle/pirate) +"lc" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"lf" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod{ + dir = 5 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"lp" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"lE" = ( +/turf/open/floor/iron/grimy, +/area/shuttle/pirate) +"mv" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/storage/box/lights/bulbs{ + pixel_y = -1 + }, +/obj/item/flashlight/seclite{ + pixel_y = -8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/storage/toolbox/mechanical, +/obj/item/dyespray{ + pixel_y = 1 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10; + pixel_y = -5 + }, +/obj/item/stack/cable_coil/five{ + pixel_y = -6 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"mA" = ( +/turf/open/floor/iron, +/area/shuttle/pirate) +"mE" = ( +/obj/machinery/door/airlock/grunge{ + name = "Special Tax Recoupment Unit" + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"mG" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light/dim/directional/north, +/obj/effect/turf_decal/bot, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"mN" = ( +/obj/machinery/loot_locator, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"mQ" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/iv_drip, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"nk" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"nq" = ( +/obj/effect/turf_decal/tile/dark/full, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"nw" = ( +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"nA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/shuttle/pirate) +"nB" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"nE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/shuttle/pirate) +"nI" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"od" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"os" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"oJ" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp{ + pixel_x = -5 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/sign/clock/directional/north, +/obj/item/megaphone/command, +/obj/item/encryptionkey/headset_com, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"pg" = ( +/obj/machinery/door/airlock/vault{ + name = "Vault"; + id_tag = "pirate_irs_vault" + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"px" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 6 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"py" = ( +/obj/structure/closet/syndicate, +/obj/item/clothing/under/rank/centcom/military, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/storage/belt/military/assault, +/obj/item/clothing/head/helmet/marine/pmc, +/obj/item/clothing/suit/armor/vest/marine/pmc, +/obj/item/clothing/mask/balaclava, +/obj/item/clothing/gloves/combat, +/obj/item/storage/backpack/security, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"pD" = ( +/obj/machinery/door/airlock/hatch{ + name = "Enhanced Auditing Interview Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"pO" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/shuttle/pirate) +"qj" = ( +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 1; + pixel_y = -16 + }, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"qm" = ( +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"qI" = ( +/obj/structure/guncase/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"qO" = ( +/obj/effect/turf_decal/bot/left, +/obj/structure/reagent_dispensers/fueltank/large, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"qU" = ( +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"rf" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/shuttle/pirate) +"sb" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/table/glass, +/obj/item/storage/medkit{ + pixel_y = -1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"se" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"sr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/south{ + id = "piratestarboardexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"sE" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"sH" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"sP" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 10 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"sS" = ( +/obj/structure/chair/stool/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/shuttle/pirate) +"tf" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 5 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"tv" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear/white, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"tC" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron, +/area/shuttle/pirate) +"tP" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"uc" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash{ + pixel_y = 4; + pixel_x = -2 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"uj" = ( +/obj/structure/sign/departments/vault/directional/north, +/obj/machinery/vending/clothing, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"uk" = ( +/obj/structure/rack, +/obj/structure/window/reinforced/tinted/spawner/directional/east, +/obj/item/knife/combat{ + pixel_x = -1 + }, +/obj/item/knife/combat{ + pixel_x = 4 + }, +/obj/item/spess_knife{ + pixel_x = 2; + pixel_y = -4 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"ur" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"uy" = ( +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1; + pixel_y = -18 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 4 + }, +/obj/machinery/door/window/right/directional/east, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"uC" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/satchel, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"uJ" = ( +/obj/structure/tank_dispenser, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"vi" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"vo" = ( +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/machinery/door/airlock/glass{ + name = "Commons Area" + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"vC" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/shuttle/pirate) +"vF" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/turf_decal/arrows{ + dir = 8; + pixel_x = 14 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"vO" = ( +/obj/effect/turf_decal/bot/right, +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"wl" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod{ + dir = 9 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"wm" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"ww" = ( +/obj/item/documents, +/obj/structure/filingcabinet, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"wM" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"xv" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"xy" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/obj/structure/bed/roller, +/obj/structure/curtain, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"xE" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/fluff{ + density = 1; + desc = "Ill-gotten gains of the Space IRS"; + icon = 'icons/obj/stack_objects.dmi'; + icon_state = "sheet-gold_3"; + name = "recouped gold" + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/light/directional/south, +/obj/machinery/door/window/brigdoor/right/directional/north{ + req_access = list("syndicate") + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"xQ" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"yl" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"yN" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/smes/engineering{ + charge = 1e+006 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/shuttle/pirate) +"yP" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, +/obj/structure/closet/crate/freezer/blood, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/o_minus, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"zh" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/shuttle/pirate) +"zy" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/shuttle/pirate) +"zG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id = "pirate_irs" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"Ae" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Ah" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/stairs{ + dir = 1 + }, +/area/shuttle/pirate) +"AB" = ( +/obj/effect/turf_decal/trimline/dark_blue/arrow_cw, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"Bf" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Bl" = ( +/obj/machinery/shuttle_scrambler{ + name = "Wireless Tax Retrieval Machine" + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Bq" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 8 + }, +/obj/structure/mirror/directional/north, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"BC" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/cas/black, +/turf/open/floor/wood, +/area/shuttle/pirate) +"BG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"Cf" = ( +/obj/machinery/vending/autodrobe{ + onstation = 0 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 6 + }, +/turf/open/floor/wood, +/area/shuttle/pirate) +"Ck" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/dark_green{ + dir = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"Cx" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/table/optable, +/obj/item/surgical_drapes, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"CB" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/item/reagent_containers/syringe{ + pixel_y = -11; + pixel_x = -5 + }, +/obj/item/clothing/suit/jacket/straight_jacket{ + pixel_y = 3 + }, +/obj/structure/rack, +/obj/item/taperecorder{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/facid{ + pixel_x = 2 + }, +/obj/item/reagent_containers/cup/bottle/facid{ + pixel_x = -7 + }, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/effect/turf_decal/stripes/white{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"CM" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/structure/bed/roller, +/obj/structure/curtain, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"Dy" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"DT" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/irs, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) +"DV" = ( +/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"Ef" = ( +/obj/effect/turf_decal/bot/left, +/obj/machinery/computer/piratepad_control{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Et" = ( +/obj/machinery/power/shuttle_engine/large, +/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"Fn" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"Fw" = ( +/obj/structure/railing, +/turf/open/floor/iron/stairs{ + dir = 8 + }, +/area/shuttle/pirate) +"FN" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/table/glass, +/obj/item/clothing/mask/muzzle/breath{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/healthanalyzer, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"FT" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"FU" = ( +/obj/machinery/power/shuttle_engine/propulsion/burst, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"FY" = ( +/obj/machinery/computer/records/medical/syndie, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Gt" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/machinery/microwave, +/turf/open/floor/iron/kitchen, +/area/shuttle/pirate) +"GN" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/safe, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod{ + dir = 10 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 9 + }, +/obj/item/gun/ballistic/revolver/mateba, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"Hf" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/glass, +/area/shuttle/pirate) +"Hg" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 4 + }, +/turf/open/floor/glass, +/area/shuttle/pirate) +"HG" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/structure/rack{ + desc = "someones got a friend in Syria!" + }, +/obj/item/melee/baseball_bat/ablative{ + name = "kneecap buster"; + desc = "This bat is made of highly reflective, highly armored material, It seems to be made specifically for busting one's kneecap"; + pixel_x = 2 + }, +/obj/item/restraints/handcuffs{ + pixel_y = -5; + pixel_x = -3 + }, +/obj/item/restraints/handcuffs{ + pixel_y = -5; + pixel_x = 2 + }, +/obj/effect/turf_decal/stripes/white{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, +/obj/item/lead_pipe, +/obj/item/flamethrower{ + name = "Fallujah firehose"; + desc = "Someone's got a friend in Syria!" + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"HO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/south{ + id = "pirateportexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"If" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"Ik" = ( +/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"Ir" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear/white, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"IE" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/table/glass, +/obj/item/storage/medkit/brute{ + pixel_y = -1 + }, +/obj/item/storage/medkit/fire{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"IU" = ( +/obj/structure/table/wood/poker, +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/north, +/obj/item/toy/cards/deck, +/turf/open/floor/wood, +/area/shuttle/pirate) +"IY" = ( +/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"IZ" = ( +/turf/open/floor/glass, +/area/shuttle/pirate) +"Jn" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Bridge" + }, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"Jq" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron/stairs{ + dir = 1 + }, +/area/shuttle/pirate) +"Jv" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/item/crowbar/red{ + pixel_y = 5 + }, +/obj/item/multitool{ + pixel_x = 3 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Jx" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 8 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"Ka" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"KA" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron, +/area/shuttle/pirate) +"KE" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/docking_port/stationary{ + dwidth = 13; + height = 220; + shuttle_id = "pirate_home"; + name = "Deep Space"; + width = 50 + }, +/obj/docking_port/mobile/pirate{ + launch_status = 0; + movement_force = list("KNOCKDOWN"=0,"THROW"=0); + name = "Pirate Ship"; + port_direction = 2 + }, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"KI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4; + name = "tactical chair" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Lf" = ( +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Lo" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 9 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"LB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/shuttle/pirate) +"LM" = ( +/obj/machinery/power/shuttle_engine/large, +/obj/effect/turf_decal/trimline/dark_blue/arrow_cw, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"LV" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"LX" = ( +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"LZ" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"Ma" = ( +/obj/structure/closet/syndicate, +/obj/item/clothing/under/rank/centcom/military, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 + }, +/obj/item/storage/belt/military/assault, +/obj/machinery/light/directional/east, +/obj/item/clothing/head/helmet/marine/pmc, +/obj/item/clothing/suit/armor/vest/marine/pmc, +/obj/item/clothing/mask/balaclava, +/obj/item/clothing/gloves/combat, +/obj/item/storage/backpack/security, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"Mu" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"Mv" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/structure/chair/e_chair{ + dir = 8 + }, +/obj/effect/turf_decal/box/red, +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"My" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"MJ" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/structure/sign/departments/security/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"Ni" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/siding/dark_green, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/shuttle/pirate) +"No" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/structure/sign/departments/security/directional/east, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"NW" = ( +/obj/structure/table/reinforced, +/obj/item/stamp{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/stamp/denied{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"NX" = ( +/obj/machinery/jukebox{ + req_access = null + }, +/obj/effect/turf_decal/siding/dark_green, +/turf/open/floor/wood, +/area/shuttle/pirate) +"Of" = ( +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood, +/area/shuttle/pirate) +"Og" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"Ot" = ( +/obj/machinery/porta_turret/syndicate/irs{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"OC" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"Pn" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/red/dim/directional/south, +/obj/item/stack/sheet/mineral/gold{ + amount = 3; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/mineral/silver{ + amount = 8; + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"PP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "pirate_irs_bridge"; + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"PX" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Room" + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"Qc" = ( +/obj/effect/turf_decal/bot/right, +/obj/machinery/piratepad, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Qi" = ( +/obj/structure/railing, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"Qn" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"Qv" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "pirate_irs_bridge"; + name = "Bridge Shutters" + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Qx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"QQ" = ( +/obj/structure/table/wood, +/obj/item/plate, +/obj/item/food/burger/bigbite, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/turf/open/floor/wood, +/area/shuttle/pirate) +"QT" = ( +/obj/machinery/vending/boozeomat/all_access{ + onstation = 0 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"QV" = ( +/obj/structure/chair/stool/bar/directional/south, +/turf/open/floor/iron/grimy, +/area/shuttle/pirate) +"Rh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "pirate_irs_bridge"; + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"Rv" = ( +/obj/structure/table/reinforced, +/obj/item/folder/blue, +/obj/item/pen/fountain, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"RB" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"RC" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"RF" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/turf/open/floor/glass, +/area/shuttle/pirate) +"RX" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"Se" = ( +/obj/machinery/photocopier/gratis, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"Ss" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"SA" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 10 + }, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/item/disk/surgery/irs, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"SC" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/dark_blue/corner, +/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"SG" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"Tg" = ( +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/structure/fluff{ + density = 1; + desc = "Ill-gotten gains of the Space IRS"; + icon = 'icons/obj/stack_objects.dmi'; + icon_state = "sheet-silver_3"; + name = "recouped silver" + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod{ + dir = 6 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 5 + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"Th" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Ts" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Tu" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/glass, +/area/shuttle/pirate) +"TA" = ( +/obj/structure/table/wood, +/obj/item/plate, +/turf/open/floor/wood, +/area/shuttle/pirate) +"Uk" = ( +/obj/machinery/door/airlock/vault{ + name = "Vault"; + id_tag = "pirate_irs_vault" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"UF" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) +"Vf" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"VB" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{ + dir = 4; + on = 1 + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"VS" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"WA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/mineral/titanium, +/area/shuttle/pirate) +"WO" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/structure/toilet{ + dir = 8; + name = "swirlie-inator 3000" + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"WR" = ( +/turf/template_noop, +/area/template_noop) +"WU" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/machinery/light/red/directional/east, +/turf/open/floor/pod/light, +/area/shuttle/pirate) +"Xr" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Auditing Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/shuttle/pirate) +"XI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "pirate_irs_bridge" + }, +/turf/open/floor/plating, +/area/shuttle/pirate) +"XX" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/dark_blue/warning{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) +"Ya" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/north{ + id = "pirate_irs_vault"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Vault Lockdown" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/pirate) +"Yf" = ( +/obj/machinery/power/rtg/advanced{ + power_gen = 608000 + }, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/right/directional/north{ + req_access = list("syndicate") + }, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/structure/window/reinforced/plasma/spawner/directional/east, +/obj/structure/window/reinforced/plasma/spawner/directional/west, +/turf/open/floor/plating, +/area/shuttle/pirate) +"Yu" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/tinted/spawner/directional/north, +/turf/open/floor/plating/airless, +/area/shuttle/pirate) +"YE" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"YJ" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/syndicate, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/public/glass{ + name = "Bridge" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) +"Zb" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron, +/area/shuttle/pirate) +"ZE" = ( +/obj/item/reagent_containers/cup/glass/bottle/ritual_wine{ + pixel_y = 14; + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -9 + }, +/obj/structure/table/reinforced, +/obj/machinery/button/door/directional/north{ + id = "pirate_irs"; + name = "Privacy Shutters" + }, +/obj/item/melee/baton/telescopic{ + pixel_y = 11; + pixel_x = 8 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 9; + pixel_x = 6 + }, +/obj/item/lighter/skull{ + pixel_x = 11; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9 + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) + +(1,1,1) = {" +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +VB +WR +WR +WR +WR +"} +(2,1,1) = {" +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +hK +hK +Qx +hK +sP +WR +WR +"} +(3,1,1) = {" +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +Jx +hK +hf +hf +hf +hK +hK +mv +ej +Yf +hK +hK +WR +"} +(4,1,1) = {" +WR +WR +WR +WR +WR +WR +hK +zG +zG +zG +hK +NX +lE +QV +Gt +bT +hK +ur +lp +yN +Yu +FU +DV +"} +(5,1,1) = {" +WR +WR +WR +WR +WR +hK +hK +ZE +hS +Se +hK +Ni +lE +QV +ip +nw +QT +vO +jp +Bf +Yu +LX +Et +"} +(6,1,1) = {" +WR +WR +WR +WR +WR +hK +ww +Fn +aT +Dy +hK +dP +lE +QV +bp +qj +hK +qO +vF +eg +Yu +LX +Ik +"} +(7,1,1) = {" +WR +WR +Lo +cL +cL +hK +oJ +Rv +NW +bO +hK +Cf +lE +QV +Ck +uy +hK +hK +PX +hK +hK +hK +hK +"} +(8,1,1) = {" +WR +WR +Rh +Ts +xv +hK +dl +kO +kO +IZ +hK +Of +fm +RF +se +vC +hK +Ae +BG +lc +fE +qU +Og +"} +(9,1,1) = {" +WR +hK +hK +FY +KA +hK +Hf +IZ +IZ +IZ +hK +IU +sS +Tu +rf +QQ +hK +mG +HO +gd +gd +hK +hK +"} +(10,1,1) = {" +WR +Rh +Qv +sE +Zb +hK +Ka +IZ +IZ +SC +hK +BC +sS +Hg +rf +TA +hK +hW +BG +VS +Bl +hK +WR +"} +(11,1,1) = {" +Lo +Rh +RC +LB +zh +hK +WA +Xr +hK +gY +hK +hK +gY +vo +WA +hK +gd +Ss +BG +lf +ig +aC +WR +"} +(12,1,1) = {" +Rh +bV +Th +mA +zy +Jn +nk +RX +wm +nk +od +nk +nk +YE +fO +os +Jq +tv +BG +Lf +Qc +hK +WR +"} +(13,1,1) = {" +Rh +LV +ev +mA +pO +YJ +sH +sH +sH +sH +Vf +dI +MJ +If +No +LZ +Ah +Ir +BG +Lf +Ef +hK +WR +"} +(14,1,1) = {" +tf +Rh +gl +nA +nE +hK +hK +hK +Uk +hK +hK +hK +hK +mE +hK +hK +gd +SG +BG +wl +Pn +aC +WR +"} +(15,1,1) = {" +WR +Rh +Jv +uc +tC +hK +ba +af +BG +GN +hK +DT +bo +Qi +ie +SA +hK +uC +BG +VS +mN +hK +WR +"} +(16,1,1) = {" +WR +hK +hK +kG +KI +hK +RB +My +BG +xE +hK +bA +bo +Qi +yl +Cx +hK +tP +sr +gd +gd +hK +hK +"} +(17,1,1) = {" +WR +WR +XI +UF +cO +hK +uk +kK +BG +Tg +hK +uj +Fw +Qi +yl +FN +hK +uJ +BG +nB +fE +qU +KE +"} +(18,1,1) = {" +WR +WR +tf +PP +PP +hK +Ya +BG +BG +BG +pg +ew +dC +BG +vi +sb +hK +hK +pD +hK +hK +hK +hK +"} +(19,1,1) = {" +WR +WR +WR +WR +WR +hK +cV +OC +Mu +OC +hK +hO +BG +XX +wM +IE +hK +iZ +nI +HG +Yu +LX +LM +"} +(20,1,1) = {" +WR +WR +WR +WR +WR +hK +hK +py +Ma +qI +hK +Bq +Qn +wM +qm +do +hK +jX +ac +xQ +Yu +LX +AB +"} +(21,1,1) = {" +WR +WR +WR +WR +WR +WR +hK +hK +hK +hK +hK +xy +mQ +CM +az +yP +hK +FT +Mv +nq +Yu +FU +IY +"} +(22,1,1) = {" +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +Ot +hK +hK +hK +hK +hK +hK +WO +WU +CB +hK +hK +WR +"} +(23,1,1) = {" +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +WR +hK +hK +hK +hK +px +WR +WR +"} diff --git a/_maps/shuttles/skyrat/pirate_nri_raider.dmm b/_maps/shuttles/skyrat/pirate_nri_raider.dmm index ba6534e89d1..c52cdd03b58 100644 --- a/_maps/shuttles/skyrat/pirate_nri_raider.dmm +++ b/_maps/shuttles/skyrat/pirate_nri_raider.dmm @@ -157,8 +157,8 @@ /obj/structure/rack/shelf, /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/red/directional/north, -/obj/item/storage/toolbox/ammo/full/nri_smg, -/obj/item/storage/toolbox/ammo/full/nri_smg, +/obj/item/storage/toolbox/ammobox/full/nri_smg, +/obj/item/storage/toolbox/ammobox/full/nri_smg, /turf/open/floor/pod/light, /area/shuttle/pirate/nri) "fJ" = ( diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm index 00293346a34..7975ed7b66a 100644 --- a/code/datums/id_trim/syndicate.dm +++ b/code/datums/id_trim/syndicate.dm @@ -28,6 +28,20 @@ sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE_HEAD access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY) +/// Trim for the space IRS agents (why are they syndie access? I wouldn't worry about it.) +/datum/id_trim/syndicom/irs + assignment = "Internal Revenue Service Agent" + trim_state = "trim_securityofficer" + department_color = COLOR_CENTCOM_BLUE + subdepartment_color = COLOR_COMMAND_BLUE + sechud_icon_state = SECHUD_DEATH_COMMANDO + access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) + +/datum/id_trim/syndicom/irs/auditor + assignment = "Internal Revenue Service Head Auditor" + trim_state = "trim_quartermaster" + sechud_icon_state = SECHUD_QUARTERMASTER + /// Trim for Syndicate mobs, outfits and corpses. /datum/id_trim/syndicom/captain assignment = "Syndicate Ship Captain" diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 06b336e1ed2..b7b2a32be89 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -785,6 +785,14 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile = /obj/projectile/bullet/syndicate_turret lethal_projectile = /obj/projectile/bullet/syndicate_turret +/obj/machinery/porta_turret/syndicate/irs + lethal_projectile = /obj/projectile/bullet/c10mm/ap + lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' + stun_projectile = /obj/projectile/bullet/c10mm/ap + stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' + armor_type = /datum/armor/syndicate_turret + faction = list(FACTION_PIRATE) + /obj/machinery/porta_turret/syndicate/shuttle scan_range = 9 shot_delay = 3 diff --git a/code/game/objects/items/storage/boxes/security_boxes.dm b/code/game/objects/items/storage/boxes/security_boxes.dm index 7cdb604d4ba..9c401f99907 100644 --- a/code/game/objects/items/storage/boxes/security_boxes.dm +++ b/code/game/objects/items/storage/boxes/security_boxes.dm @@ -238,6 +238,16 @@ for(var/i in 1 to 6) new /obj/item/ammo_casing/shotgun/beanbag(src) +/obj/item/storage/box/breacherslug + name = "box of breaching shotgun shells" + desc = "A box full of breaching slugs, designed for rapid entry, not very effective against anything else." + icon_state = "breacher_box" + illustration = null + +/obj/item/storage/box/breacherslug/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/ammo_casing/shotgun/breacher(src) + /obj/item/storage/box/emptysandbags name = "box of empty sandbags" illustration = "sandbag" diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 6cf9baf0737..75ea51f07b1 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -225,10 +225,9 @@ new /obj/item/stack/pipe_cleaner_coil/white(src) new /obj/item/stack/pipe_cleaner_coil/brown(src) -/obj/item/storage/toolbox/a762 - name = "7.62mm ammo box (Surplus?)" - desc = "It contains a few clips. Goddamn, this thing smells awful. \ - Has this been sitting in a warehouse for the last several centuries?" +/obj/item/storage/toolbox/ammobox + name = "ammo canister" + desc = "A metal canister designed to hold ammunition" icon_state = "ammobox" inhand_icon_state = "ammobox" lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' @@ -236,15 +235,30 @@ has_latches = FALSE drop_sound = 'sound/items/handling/ammobox_drop.ogg' pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' - var/ammo_to_spawn = /obj/item/ammo_box/a762 + var/ammo_to_spawn -/obj/item/storage/toolbox/a762/PopulateContents() - for(var/i in 1 to 6) - new ammo_to_spawn(src) +/obj/item/storage/toolbox/ammobox/PopulateContents() + if(!isnull(ammo_to_spawn)) + for(var/i in 1 to 6) + new ammo_to_spawn(src) -/obj/item/storage/toolbox/a762/surplus +/obj/item/storage/toolbox/ammobox/a762 + name = "7.62mm ammo box (Surplus?)" + desc = "It contains a few clips. Goddamn, this thing smells awful. \ + Has this been sitting in a warehouse for the last several centuries?" + ammo_to_spawn = /obj/item/ammo_box/a762 + +/obj/item/storage/toolbox/ammobox/a762/surplus ammo_to_spawn = /obj/item/ammo_box/a762/surplus +/obj/item/storage/toolbox/ammobox/wt550m9 + name = "4.6x30mm ammo box" + ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9 + +/obj/item/storage/toolbox/ammobox/wt550m9ap + name = "4.6x30mm AP ammo box" + ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9/wtap + /obj/item/storage/toolbox/maint_kit name = "gun maintenance kit" desc = "It contains some gun maintenance supplies" diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index f2ecf53fddc..82a3b08e346 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -28,7 +28,7 @@ playsound(src, P.hitsound, 50, TRUE) var/damage if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object - damage = take_damage(P.damage, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration) + damage = take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration) if(P.suppressed != SUPPRESSED_VERY) visible_message(span_danger("[src] is hit by \a [P][damage ? "" : ", without leaving a mark"]!"), null, null, COMBAT_MESSAGE_RANGE) diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index ed800fb42bc..0d4a1842b00 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -133,3 +133,8 @@ icon_state = "ecase" case_type = "egun" gun_category = /obj/item/gun/energy/e_gun + +/obj/structure/guncase/wt550 + name = "WT-550 gun locker" + desc = "A locker that holds WT-550 rifles." + case_type = "wt550" diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index d4e9755c325..f2111981b40 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -150,3 +150,25 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) response_received = "Wait, you ACTUALLY gave us the money? Thanks, but we're coming for the rest anyways!" response_too_late = "Nothing, huh? Looks like the Tide's coming aboard!" response_not_enough = "You trying to cheat us? That's fine, we'll take your station as collateral." + +///Agents from the space I.R.S. heavily armed to stea- I mean, collect the station's tax dues +/datum/pirate_gang/irs + name = "Space IRS" + + is_heavy_threat = TRUE + ship_template_id = "irs" + ship_name_pool = "irs_names" + + threat_title = "Missing Tax Dues" + threat_content = "%SHIPNAME Here, We noticed that your station hasn't been paying your taxes.. \ + Let's rectify that, Your missing tax dues amounts to %PAYOFF \ + We highly recommend paying your taxes stat, \ + we don't need to send a team to your station to resolve the situation do we?" + arrival_announcement = "This is the tax conflict resolution team, prepare for your assets to be liquidated and be charged with tax fraud, \ + if you fail to pay your taxes in time." + possible_answers = list("You know, I was just about to pay that. Thanks for the reminder!","I don't care WHO the IRS sends, I'm not paying for my taxes!") + + response_received = "Payment received, We salute you for being law-abiding tax-paying citizens" + response_too_late = "Too late, A team has already been sent out resolve this matter directly." + response_not_enough = "You filed your taxes incorrectly, A team has been sent to assist in liquidating assets and arrest you for tax fraud. \ + Nothing personel kid." diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index 18651f4acd0..6b070c1b4df 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -101,3 +101,27 @@ shoes = /obj/item/clothing/shoes/sneakers/black l_pocket = /obj/item/reagent_containers/cup/glass/coffee r_pocket = /obj/item/tank/internals/emergency_oxygen + +/datum/outfit/pirate/irs + name = "IRS Agent Outfit" + id = /obj/item/card/id/advanced + id_trim = /datum/id_trim/syndicom/irs + uniform = /obj/item/clothing/under/costume/buttondown/slacks + suit = /obj/item/clothing/suit/costume/irs + back = null + glasses = /obj/item/clothing/glasses/sunglasses + gloves = null + head = /obj/item/clothing/head/costume/irs + shoes = /obj/item/clothing/shoes/laceup + ears = /obj/item/radio/headset/syndicate + ears = /obj/item/radio/headset/syndicate/alt + +/datum/outfit/pirate/irs/auditor + name = "IRS Head Auditor" + id_trim = /datum/id_trim/syndicom/irs/auditor + uniform = /obj/item/clothing/under/suit/charcoal + neck = /obj/item/clothing/neck/tie/red/tied + suit = null + ears = /obj/item/radio/headset/syndicate/alt/leader + head = null + belt = /obj/item/storage/belt/holster/detective/full/ert diff --git a/code/modules/antagonists/pirate/pirate_roles.dm b/code/modules/antagonists/pirate/pirate_roles.dm index 63e371f9a5c..f4de0e78eed 100644 --- a/code/modules/antagonists/pirate/pirate_roles.dm +++ b/code/modules/antagonists/pirate/pirate_roles.dm @@ -140,3 +140,33 @@ /obj/effect/mob_spawn/ghost_role/human/pirate/grey/shitter rank = "Tidemaster" + +/obj/effect/mob_spawn/ghost_role/human/pirate/irs + name = "\improper Space IRS sleeper" + desc = "A surprisingly clean cryogenic sleeper. You can see your reflection on the sides!" + density = FALSE + you_are_text = "You are an agent working for the space IRS" + flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of it's income regardless! Through peaceful means or otherwise..." + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + prompt_name = "An agent of the space IRS" + outfit = /datum/outfit/pirate/irs + fluff_spawn = null // dirs are fucked and I don't have the energy to deal with it + rank = "Agent" + +/obj/effect/mob_spawn/ghost_role/human/pirate/irs/generate_pirate_name(spawn_gender) + var/first_name + switch(spawn_gender) + if(MALE) + first_name = pick(GLOB.first_names_male) + if(FEMALE) + first_name = pick(GLOB.first_names_female) + else + first_name = pick(GLOB.first_names) + + return "[rank] [first_name]" + + +/obj/effect/mob_spawn/ghost_role/human/pirate/irs/auditor + rank = "Head Auditor" + outfit = /datum/outfit/pirate/irs/auditor diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm index 2c145e54084..105570e9e4b 100644 --- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm +++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm @@ -126,6 +126,19 @@ var/cooldown = 300 var/next_use = 0 +/// Surgery disk for the space IRS (I don't know where to dump them anywhere else) +/obj/item/disk/surgery/irs + name = "Advanced Surgery Disk" + desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console." + surgeries = list( + /datum/surgery/advanced/lobotomy, + /datum/surgery/advanced/bioware/vein_threading, + /datum/surgery/advanced/bioware/nerve_splicing, + /datum/surgery_step/heal/combo/upgraded, + /datum/surgery_step/pacify, + /datum/surgery_step/revive, + ) + /obj/machinery/loot_locator/interact(mob/user) if(world.time <= next_use) to_chat(user,span_warning("[src] is recharging.")) diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index 8799111de8f..2f19e8c90ae 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -219,8 +219,8 @@ /obj/item/food/rationpack, /obj/item/ammo_box/a762, /obj/item/ammo_box/a762/surplus, - /obj/item/storage/toolbox/a762, - /obj/item/storage/toolbox/a762/surplus, + /obj/item/storage/toolbox/ammobox/a762, + /obj/item/storage/toolbox/ammobox/a762/surplus, /obj/item/storage/toolbox/maint_kit, /obj/item/clothing/suit/armor/vest/russian, /obj/item/clothing/head/helmet/rus_helmet, diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 324b8ddeb98..2e4583f9c5e 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -235,7 +235,7 @@ cost = CARGO_CRATE_VALUE * 5 contains = list(/obj/item/gun/energy/e_gun/dragnet = 3) crate_name = "\improper DRAGnet crate" - + // SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS /* /datum/supply_pack/security/armory/energy @@ -319,38 +319,6 @@ contains = list(/obj/item/shield/riot = 3) crate_name = "riot shields crate" -/* SKYRAT EDIT REMOVAL START -/datum/supply_pack/security/armory/russian - name = "Russian Surplus Crate" - desc = "Hello Comrade, we have the most modern russian military equipment the \ - black market can offer, for the right price of course. Sadly we couldn't remove \ - the lock, so it" - cost = CARGO_CRATE_VALUE * 12 - contraband = TRUE - contains = list(/obj/item/food/rationpack, - /obj/item/ammo_box/a762, - /obj/item/storage/toolbox/ammo, - /obj/item/storage/toolbox/maint_kit, - /obj/item/clothing/suit/armor/vest/russian, - /obj/item/clothing/head/helmet/rus_helmet, - /obj/item/clothing/shoes/russian, - /obj/item/clothing/gloves/tackler/combat, - /obj/item/clothing/under/syndicate/rus_army, - /obj/item/clothing/under/costume/soviet, - /obj/item/clothing/mask/russian_balaclava, - /obj/item/clothing/head/helmet/rus_ushanka, - /obj/item/clothing/suit/armor/vest/russian_coat, - /obj/item/gun/ballistic/rifle/boltaction = 2, - ) - crate_name = "surplus military crate" - -/datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C) - for(var/i in 1 to 10) - var/item = pick(contains) - new item(C) -*/ // SKYRAT EDIT REMOVAL END - - /datum/supply_pack/security/armory/swat name = "SWAT Crate" desc = "Contains two fullbody sets of tough, fireproof suits designed in a joint \ diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e6ef50879c4..41314158586 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -120,6 +120,14 @@ name = "marine medic helmet" icon_state = "marine_medic" +/obj/item/clothing/head/helmet/marine/pmc + icon_state = "marine" + desc = "A tactical black helmet, designed to protect one's head and not much else." + min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT + max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT + clothing_flags = null + armor_type = /datum/armor/pmc + /obj/item/clothing/head/helmet/old name = "degrading helmet" desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances." diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index b6b2bb409e6..01ee43f4d29 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -64,8 +64,7 @@ head = /obj/item/clothing/head/fedora/det_hat l_hand = /obj/item/gun/ballistic l_hand = null - //r_pocket = /obj/item/ammo_box/c10mm - r_hand = /obj/item/ammo_box/c10mm // SKYRAT EDIT CHANGE + r_pocket = /obj/item/ammo_box/c10mm /datum/outfit/tournament/janitor name = "tournament janitor" @@ -137,86 +136,6 @@ head = /obj/item/clothing/head/helmet/bluetaghelm shoes = /obj/item/clothing/shoes/sneakers/blue -/datum/outfit/pirate - name = "Space Pirate" - - id = /obj/item/card/id/advanced - id_trim = /datum/id_trim/pirate - uniform = /obj/item/clothing/under/costume/pirate - suit = /obj/item/clothing/suit/costume/pirate/armored - ears = /obj/item/radio/headset/syndicate - glasses = /obj/item/clothing/glasses/eyepatch - head = /obj/item/clothing/head/costume/pirate/bandana/armored - shoes = /obj/item/clothing/shoes/sneakers/brown - - back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION - backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION - -/datum/outfit/pirate/post_equip(mob/living/carbon/human/equipped) - equipped.faction |= "pirate" - - var/obj/item/radio/outfit_radio = equipped.ears - if(outfit_radio) - outfit_radio.set_frequency(FREQ_SYNDICATE) - outfit_radio.freqlock = RADIO_FREQENCY_LOCKED - - var/obj/item/card/id/outfit_id = equipped.wear_id - if(outfit_id) - outfit_id.registered_name = equipped.real_name - outfit_id.update_label() - outfit_id.update_icon() - - var/obj/item/clothing/under/pirate_uniform = equipped.w_uniform - if(pirate_uniform) - pirate_uniform.has_sensor = NO_SENSORS - pirate_uniform.sensor_mode = SENSOR_OFF - equipped.update_suit_sensors() - -/datum/outfit/pirate/captain - name = "Space Pirate Captain" - - id_trim = /datum/id_trim/pirate/captain - head = /obj/item/clothing/head/costume/pirate/armored - -/datum/outfit/pirate/space - name = "Space Pirate (EVA)" - - suit = /obj/item/clothing/suit/space/pirate - suit_store = /obj/item/tank/internals/oxygen - head = /obj/item/clothing/head/helmet/space/pirate/bandana - mask = /obj/item/clothing/mask/breath - - back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION - backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION - -/datum/outfit/pirate/space/captain - name = "Space Pirate Captain (EVA)" - - head = /obj/item/clothing/head/helmet/space/pirate - -/datum/outfit/pirate/silverscale - name = "Silver Scale Member" - - id = /obj/item/card/id/advanced/silver - id_trim = /datum/id_trim/pirate/silverscale - uniform = /obj/item/clothing/under/syndicate/sniper - suit = /obj/item/clothing/suit/armor/vest/alt - glasses = /obj/item/clothing/glasses/monocle - gloves = /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/collectable/tophat - shoes = /obj/item/clothing/shoes/laceup - - back = /obj/item/storage/backpack/satchel/leather //SKYRAT EDIT ADDITION - backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) //SKYRAT EDIT ADDITION - -/datum/outfit/pirate/silverscale/captain - name = "Silver Scale Captain" - - id_trim = /datum/id_trim/pirate/captain/silverscale - head = /obj/item/clothing/head/costume/crown - mask = /obj/item/clothing/mask/cigarette/cigar/havana - l_pocket = /obj/item/lighter - /datum/outfit/tunnel_clown name = "Tunnel Clown" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7dcab5b3e36..04366123ddc 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -69,6 +69,16 @@ acid = 50 wound = 20 +/datum/armor/pmc + melee = 40 + bullet = 50 + laser = 60 + energy = 50 + bomb = 50 + bio = 100 + acid = 50 + wound = 20 + /obj/item/clothing/suit/armor/vest/marine/security name = "large tactical armor vest" icon_state = "marine_security" @@ -82,6 +92,13 @@ icon_state = "marine_medic" body_parts_covered = CHEST|GROIN +/obj/item/clothing/suit/armor/vest/marine/pmc + desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing." + min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT + max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT + clothing_flags = THICKMATERIAL + armor_type = /datum/armor/pmc + /obj/item/clothing/suit/armor/vest/old name = "degrading armor vest" desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in." diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 9d0c7686cee..918d09447e3 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -577,3 +577,11 @@ inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/suit/costume/irs + name = "internal revenue service jacket" + desc = "I'm crazy enough to take on The Owl, but the IRS? Nooo thank you!" + icon_state = "irs_suit" + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS|ARMS + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index c64d54c8082..e1f233d51f8 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -161,3 +161,10 @@ reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 6) //;HELP OPS IN MAINT reagents.add_reagent(/datum/reagent/toxin/coniine, 6) reagents.add_reagent(/datum/reagent/toxin/sodium_thiopental, 6) + +/obj/item/ammo_casing/shotgun/breacher + name = "breaching slug" + desc = "A 12 gauge anti-material slug. Great for breaching airlocks and windows, quickly and efficiently." + icon_state = "breacher" + projectile_type = /obj/projectile/bullet/shotgun_breaching + custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2) diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 330823803b4..d5e234034d6 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -29,6 +29,10 @@ name = "double-barrel shotgun internal magazine (slugs)" ammo_type = /obj/item/ammo_casing/shotgun +/obj/item/ammo_box/magazine/internal/shot/dual/breacherslug + name = "double-barrel shotgun internal magazine (breacher)" + ammo_type = /obj/item/ammo_casing/shotgun/breacher + /obj/item/ammo_box/magazine/internal/shot/riot name = "riot shotgun internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 38a4cee32a4..74305fb811d 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -234,7 +234,6 @@ burst_size = 3 fire_delay = 1 - // L6 SAW // /obj/item/gun/ballistic/automatic/l6_saw diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index a5f2ac1908a..626de9fe2c5 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -291,6 +291,12 @@ sawn_desc = "A sawn-off hunting shotgun. In its new state, it's remarkably less effective at hunting... anything." mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs +/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug + name = "breaching shotgun" + desc = "A normal double-barrel shotgun that has been rechambered to fit breaching shells. Useful in breaching airlocks and windows, not much else." + sawn_desc = "A sawn-off breaching shotgun, making for a more compact configuration while still having the same capability as before." + mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug + /obj/item/gun/ballistic/shotgun/hook name = "hook modified sawn-off shotgun" desc = "Range isn't an issue when you can bring your victim to you." diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index cde530c6ed5..813a10b14e9 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -128,3 +128,12 @@ /obj/projectile/bullet/scattershot icon_state = "pellet" damage = 24 + +//Breaching Ammo + +/obj/projectile/bullet/shotgun_breaching + name = "12g breaching round" + desc = "A breaching round designed to destroy airlocks and windows with only a few shots. Ineffective against other targets." + hitsound = 'sound/weapons/sonic_jackhammer.ogg' + damage = 5 //does shit damage to everything except doors and windows + demolition_mod = 200 //one shot to break a window or grille, or two shots to breach an airlock door diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index e0abf9a188f..3913832dbf5 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -149,6 +149,7 @@ /obj/item/clothing/under/ethereal_tunic = 3, /obj/item/clothing/suit/costume/ianshirt = 1, + /obj/item/clothing/suit/costume/irs = 20, /obj/item/clothing/head/costume/irs = 20, /obj/item/clothing/head/costume/tmc = 20, /obj/item/clothing/head/costume/deckers = 20, diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi index 6cd082395b5..5b30ae65b8f 100644 Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ diff --git a/icons/mob/clothing/suits/costume.dmi b/icons/mob/clothing/suits/costume.dmi index a81cf2c38ff..0f10e239019 100644 Binary files a/icons/mob/clothing/suits/costume.dmi and b/icons/mob/clothing/suits/costume.dmi differ diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi index b3c23024424..d9f02085e73 100644 Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ diff --git a/icons/obj/clothing/suits/costume.dmi b/icons/obj/clothing/suits/costume.dmi index 88102eeb421..b4532306044 100644 Binary files a/icons/obj/clothing/suits/costume.dmi and b/icons/obj/clothing/suits/costume.dmi differ diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi index 43c10c2f286..b7a793d7209 100644 Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ diff --git a/icons/obj/storage/closet.dmi b/icons/obj/storage/closet.dmi index 154e18c6d71..8c5285e1167 100644 Binary files a/icons/obj/storage/closet.dmi and b/icons/obj/storage/closet.dmi differ diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi index 5dd3d83b206..e020d2eb669 100644 Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ diff --git a/modular_skyrat/master_files/code/modules/antagonists/pirate/pirate_outfits.dm b/modular_skyrat/master_files/code/modules/antagonists/pirate/pirate_outfits.dm new file mode 100644 index 00000000000..95d1e38dae6 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/antagonists/pirate/pirate_outfits.dm @@ -0,0 +1,9 @@ +// Pirate outfit overrides + +/datum/outfit/pirate + back = /obj/item/storage/backpack/satchel/leather + backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45 = 3) + + +/datum/outfit/pirate/irs + back = /obj/item/storage/backpack/satchel/leather diff --git a/modular_skyrat/master_files/code/modules/clothing/outfits/standard.dm b/modular_skyrat/master_files/code/modules/clothing/outfits/standard.dm new file mode 100644 index 00000000000..969174430db --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/outfits/standard.dm @@ -0,0 +1,5 @@ +// Standard outfit overrides + +/datum/outfit/tournament/gangster + r_pocket = null + r_hand = /obj/item/ammo_box/c10mm diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index 76856aec040..fe3fc680373 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -701,5 +701,5 @@ /obj/item/ammo_box/a762/surplus name = "stripper clip (.244 Acia surplus)" -/obj/item/storage/toolbox/a762 +/obj/item/storage/toolbox/ammobox/a762 name = ".244 Acia ammo box (Surplus?)" diff --git a/modular_skyrat/modules/aesthetics/storage/storage.dm b/modular_skyrat/modules/aesthetics/storage/storage.dm index a3293a2c024..92bd763cd90 100644 --- a/modular_skyrat/modules/aesthetics/storage/storage.dm +++ b/modular_skyrat/modules/aesthetics/storage/storage.dm @@ -112,6 +112,9 @@ icon_state = "secbox_xl" illustration = "beanbag" +/obj/item/storage/box/breacherslug + icon_state = "secbox_xl" + illustration = "breacherslug" /obj/item/storage/box/evidence icon_state = "secbox" diff --git a/modular_skyrat/modules/aesthetics/storage/storage.dmi b/modular_skyrat/modules/aesthetics/storage/storage.dmi index b3f46c9d58a..8981f23b3a9 100644 Binary files a/modular_skyrat/modules/aesthetics/storage/storage.dmi and b/modular_skyrat/modules/aesthetics/storage/storage.dmi differ diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm index be22f591c88..052dbe0dac2 100644 --- a/modular_skyrat/modules/cargo/code/packs.dm +++ b/modular_skyrat/modules/cargo/code/packs.dm @@ -716,7 +716,7 @@ contains = list( /obj/item/crucifix = 3, /obj/item/storage/box/nri_rations = 3, - /obj/item/storage/toolbox/a762 = 1, + /obj/item/storage/toolbox/ammobox/a762 = 1, /obj/item/storage/toolbox/maint_kit = 1, /obj/item/gun/ballistic/rifle/boltaction = 1, /obj/item/ammo_box/a762 = 3, diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm index 42fd227742a..094970ccd55 100644 --- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -225,12 +225,12 @@ /obj/structure/closet/crate/secure/weapon/nri/heavy/offense/PopulateContents() new /obj/item/gun/ballistic/automatic/l6_saw/unrestricted(src) - new /obj/item/storage/toolbox/ammo/full/l6_saw(src) - new /obj/item/storage/toolbox/ammo/full/krinkov(src) - new /obj/item/storage/toolbox/ammo/full/krinkov/emp(src) - new /obj/item/storage/toolbox/ammo/full/krinkov/fire(src) - new /obj/item/storage/toolbox/ammo/full/krinkov/ricochet(src) - new /obj/item/storage/toolbox/ammo/full/krinkov/ap(src) - new /obj/item/storage/toolbox/ammo/full/nri_smg(src) - new /obj/item/storage/toolbox/ammo/full/nri_smg(src) - new /obj/item/storage/toolbox/ammo/full/aps(src) + new /obj/item/storage/toolbox/ammobox/full/l6_saw(src) + new /obj/item/storage/toolbox/ammobox/full/krinkov(src) + new /obj/item/storage/toolbox/ammobox/full/krinkov/emp(src) + new /obj/item/storage/toolbox/ammobox/full/krinkov/fire(src) + new /obj/item/storage/toolbox/ammobox/full/krinkov/ricochet(src) + new /obj/item/storage/toolbox/ammobox/full/krinkov/ap(src) + new /obj/item/storage/toolbox/ammobox/full/nri_smg(src) + new /obj/item/storage/toolbox/ammobox/full/nri_smg(src) + new /obj/item/storage/toolbox/ammobox/full/aps(src) diff --git a/modular_skyrat/modules/novaya_ert/code/toolbox.dm b/modular_skyrat/modules/novaya_ert/code/toolbox.dm index a93619b2f15..e0c63d407fd 100644 --- a/modular_skyrat/modules/novaya_ert/code/toolbox.dm +++ b/modular_skyrat/modules/novaya_ert/code/toolbox.dm @@ -1,4 +1,4 @@ -/obj/item/storage/toolbox/ammo +/obj/item/storage/toolbox/ammobox desc = "It contains a few clips." icon_state = "ammobox" inhand_icon_state = "ammobox" @@ -8,72 +8,72 @@ drop_sound = 'sound/items/handling/ammobox_drop.ogg' pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' -/obj/item/storage/toolbox/ammo/PopulateContents() +/obj/item/storage/toolbox/ammobox/PopulateContents() return -/obj/item/storage/toolbox/ammo/full +/obj/item/storage/toolbox/ammobox/full var/ammo_type = null ///Type of mags/casings/clips we spawn in. var/amount = 0 ///Amount of mags/casings/clips we spawn in. -/obj/item/storage/toolbox/ammo/full/PopulateContents() +/obj/item/storage/toolbox/ammobox/full/PopulateContents() for(var/i in 1 to amount) new ammo_type(src) -/obj/item/storage/toolbox/ammo/full/mosin +/obj/item/storage/toolbox/ammobox/full/mosin name = "ammo box (Sportiv)" ammo_type = /obj/item/ammo_box/a762 amount = 7 -/obj/item/storage/toolbox/ammo/full/krinkov +/obj/item/storage/toolbox/ammobox/full/krinkov name = "ammo box (Krinkov)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/akm amount = 7 -/obj/item/storage/toolbox/ammo/full/krinkov/emp +/obj/item/storage/toolbox/ammobox/full/krinkov/emp name = "ammo box (Krinkov, EMP)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/akm/emp -/obj/item/storage/toolbox/ammo/full/krinkov/fire +/obj/item/storage/toolbox/ammobox/full/krinkov/fire name = "ammo box (Krinkov, incendiary)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/akm/fire -/obj/item/storage/toolbox/ammo/full/krinkov/ricochet +/obj/item/storage/toolbox/ammobox/full/krinkov/ricochet name = "ammo box (Krinkov, match)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/akm/ricochet -/obj/item/storage/toolbox/ammo/full/krinkov/ap +/obj/item/storage/toolbox/ammobox/full/krinkov/ap name = "ammo box (Krinkov, armor piercing)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/akm/ap -/obj/item/storage/toolbox/ammo/full/bison +/obj/item/storage/toolbox/ammobox/full/bison name = "ammo box (PP-95)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx amount = 4 -/obj/item/storage/toolbox/ammo/full/nri_smg +/obj/item/storage/toolbox/ammobox/full/nri_smg name = "ammo box (QLP/04)" ammo_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx amount = 7 -/obj/item/storage/toolbox/ammo/full/l6_saw +/obj/item/storage/toolbox/ammobox/full/l6_saw name = "ammo box (L6 SAW)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/mm712x82 amount = 7 -/obj/item/storage/toolbox/ammo/full/makarov +/obj/item/storage/toolbox/ammobox/full/makarov name = "ammo box (R-C Makarov)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/multi_sprite/makarov amount = 7 -/obj/item/storage/toolbox/ammo/full/aps +/obj/item/storage/toolbox/ammobox/full/aps name = "ammo box (Szabo-Ivanek/APS)" desc = "It contains a few magazines." ammo_type = /obj/item/ammo_box/magazine/m9mm_aps diff --git a/modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi b/modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi index c18a8d1dbbd..cfe5fdaa1ff 100644 Binary files a/modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi and b/modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi differ diff --git a/strings/pirates.json b/strings/pirates.json index 443ff9e62f2..1801511b6b4 100644 --- a/strings/pirates.json +++ b/strings/pirates.json @@ -85,6 +85,7 @@ "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", @@ -104,6 +105,7 @@ "Space Queen's Revenge", "Star Scraper", "Syndicate Privateer", + "The Mazianni", "War as a Business", "Xenophobia" ], @@ -204,6 +206,18 @@ "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", diff --git a/tgstation.dme b/tgstation.dme index d6460b7f8c9..3dda23df037 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5559,6 +5559,7 @@ #include "modular_skyrat\master_files\code\modules\antagonists\ashwalker\ashwalker.dm" #include "modular_skyrat\master_files\code\modules\antagonists\cult\cult_items.dm" #include "modular_skyrat\master_files\code\modules\antagonists\ert\ert.dm" +#include "modular_skyrat\master_files\code\modules\antagonists\pirate\pirate_outfits.dm" #include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\kill_pet.dm" #include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\smuggling.dm" #include "modular_skyrat\master_files\code\modules\asset_cache\assets\plumbing.dm" @@ -5618,6 +5619,7 @@ #include "modular_skyrat\master_files\code\modules\clothing\head\monkey_magnification_helmet.dm" #include "modular_skyrat\master_files\code\modules\clothing\masks\_masks.dm" #include "modular_skyrat\master_files\code\modules\clothing\outfits\ert.dm" +#include "modular_skyrat\master_files\code\modules\clothing\outfits\standard.dm" #include "modular_skyrat\master_files\code\modules\clothing\shoes\bananashoes.dm" #include "modular_skyrat\master_files\code\modules\clothing\shoes\boots.dm" #include "modular_skyrat\master_files\code\modules\clothing\shoes\sneakers.dm" diff --git a/tools/UpdatePaths/Scripts/76115_toolbox_762_to_ammobox_762.txt b/tools/UpdatePaths/Scripts/76115_toolbox_762_to_ammobox_762.txt new file mode 100644 index 00000000000..e9569eaf0f9 --- /dev/null +++ b/tools/UpdatePaths/Scripts/76115_toolbox_762_to_ammobox_762.txt @@ -0,0 +1,4 @@ +#this changes a762 toolbox into a child of ammobox + +/obj/item/storage/toolbox/a762 : /obj/item/storage/toolbox/ammobox/a762{@OLD} +/obj/item/storage/toolbox/a762/surplus : /obj/item/storage/toolbox/ammobox/a762/surplus{@OLD} \ No newline at end of file