From b646ac7b072689cacd04c81da24b00065a1e1bbe Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 17:39:38 +0500 Subject: [PATCH 01/10] Tapok-class Assault Box MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "Вероятно, вы доживете до того дня, когда сможете увидеть рукотворные ужасы, выходящие за рамки вашего понимания." --- _maps/_mod_celadon/configs/inteq_tapok.json | 37 + .../shuttles/inteq/inteq_tapok.dmm | 793 ++++++++++++++++++ 2 files changed, 830 insertions(+) create mode 100644 _maps/_mod_celadon/configs/inteq_tapok.json create mode 100644 _maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm diff --git a/_maps/_mod_celadon/configs/inteq_tapok.json b/_maps/_mod_celadon/configs/inteq_tapok.json new file mode 100644 index 000000000000..c7c923a7fcb1 --- /dev/null +++ b/_maps/_mod_celadon/configs/inteq_tapok.json @@ -0,0 +1,37 @@ +{ + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Tapok-class Assault Box Mk.III", + "map_short_name": "Inteq-Tapok", + "description": "Боевое судно класса тапок, создан как абсурдно более дешевая замена кораблям класса Iron-Maiden в связи с урезкой бюджета после потери десятков суден идиотами которые пытались бодаться против АСТЕРОИДОВ. Из-за таких уникумов, организация вынуждена показать ценность данных ресурсов иным способом", + "map_path": "_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm", + "enabled": true, + "limit": 1, + "prefix": "LIQSV", + "faction": "/datum/faction/inteq", + "tags": ["Combat", "Riot"], + "namelists": [ + "MYTHOLOGICAL", + "BEASTS", + "NATURAL_AGGRESSIVE", + "INTEQ" + ], + "job_slots": { + "Vanguard": { + "outfit": "/datum/outfit/job/inteq/captain/celadon", + "officer": true, + "slots": 1 + }, + "Artificer": { + "outfit": "/datum/outfit/job/inteq/engineer/celadon", + "slots": 1 + }, + "Corpsman": { + "outfit": "/datum/outfit/job/inteq/paramedic/celadon", + "slots": 1 + }, + "Enforcer": { + "outfit": "/datum/outfit/job/inteq/security/celadon", + "slots": 2 + } + } +} diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm new file mode 100644 index 000000000000..728f410085af --- /dev/null +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -0,0 +1,793 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/ship, +/area/ship/bridge) +"b" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/window/eastright{ + name = "Engine Access"; + dir = 2 + }, +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/structure/window/plasma/reinforced/spawner/west{ + dir = 1 + }, +/obj/machinery/door/poddoor{ + id = "iron_maiden_eng"; + name = "Engine Blast Door" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"c" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/machinery/computer/helm{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"d" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/item/flashlight/seclite, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/helmet/swat/inteq, +/obj/item/clothing/suit/armor/vest/inteq, +/obj/item/storage/belt/security/webbing/inteq/alt, +/obj/item/clothing/shoes/combat, +/obj/item/radio/headset/inteq, +/obj/item/clothing/gloves/combat, +/obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/structure/closet/secure_closet/wall{ + icon_state = "generic_wall"; + name = "equipment locker"; + pixel_y = 28; + dir = 1 + }, +/obj/item/gun/ballistic/automatic/pistol/glock, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"e" = ( +/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"f" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"g" = ( +/obj/effect/turf_decal/trimline/opaque/solgovgold/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"h" = ( +/obj/structure/window/plasma/reinforced/spawner/west{ + dir = 2 + }, +/obj/machinery/power/terminal, +/obj/structure/cable, +/obj/structure/table/optable, +/obj/structure/curtain/cloth, +/turf/open/floor/plasteel/mono/white, +/area/ship/bridge) +"i" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "iron_maiden_bridge"; + name = "Blast Shutters" + }, +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/turf/open/floor/plating, +/area/ship/bridge) +"j" = ( +/obj/machinery/door/window/brigdoor/westleft{ + req_ship_access = 1 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"k" = ( +/obj/machinery/door/airlock/security/glass{ + dir = 4; + name = "Шлюз"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"l" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/porta_turret/ship/inteq{ + dir = 5; + id = "iron2_turrets" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"m" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "Iron_maiden_cargo"; + name = "Cargo Shutter" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/solgovgold/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/fans/tiny/invisible, +/obj/docking_port/mobile{ + dir = 2; + launch_status = 0; + port_direction = 8; + preferred_direction = 4; + set_dir_on_move = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"n" = ( +/obj/machinery/porta_turret/ship/inteq{ + dir = 6; + id = "iron2_turrets" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"o" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/item/spacecash/bundle/c500{ + pixel_y = -10 + }, +/obj/item/spacecash/bundle/c500{ + pixel_y = -3; + pixel_x = 3 + }, +/obj/item/gun/energy/disabler{ + pixel_y = 5; + pixel_x = 7 + }, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = -12 + }, +/obj/item/stamp/inteq{ + layer = 4; + pixel_x = 10 + }, +/obj/machinery/turretid/ship{ + dir = 8; + pixel_x = -9; + id = "iron2_turrets"; + pixel_y = 25 + }, +/obj/machinery/newscaster/directional/west{ + pixel_y = 39; + pixel_x = 6; + dir = 1 + }, +/obj/machinery/button/door{ + id = "iron_maiden_bridge"; + name = "Фронтальные задвижки"; + pixel_x = 6; + pixel_y = 23 + }, +/obj/structure/window/plasma/reinforced/spawner/west, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"p" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + id = "iron_maiden_eng"; + name = "Engine Blast Door" + }, +/turf/open/floor/plating/ship, +/area/ship/bridge) +"q" = ( +/obj/effect/turf_decal/trimline/opaque/solgovgold/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"r" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/machinery/computer/cryopod/directional/east, +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/black, +/area/ship/bridge) +"s" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"t" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/turf/open/floor/plating/ship, +/area/ship/bridge) +"u" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/window/eastright{ + name = "Engine Access"; + dir = 1 + }, +/obj/structure/window/plasma/reinforced/spawner/west{ + dir = 2 + }, +/obj/structure/window/plasma/reinforced/spawner/west, +/obj/machinery/door/poddoor{ + id = "iron_maiden_eng"; + name = "Engine Blast Door" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"v" = ( +/obj/structure/catwalk, +/obj/structure/marker_beacon{ + picked_color = "Lime" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/bridge) +"w" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/admin/inteq{ + density = 0; + visible_to_network = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"x" = ( +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "iron_maiden_bridge"; + name = "Blast Shutters" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"y" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"z" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"A" = ( +/obj/machinery/suit_storage_unit/inherit{ + req_access_txt = "147;148" + }, +/obj/item/clothing/suit/space/hardsuit/syndi/inteq, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/mask/gas/sechailer, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/machinery/light/directional/south, +/obj/item/gun/ballistic/automatic/pistol/usp45, +/obj/item/storage/box/ammo/a357, +/obj/item/melee/baton/loaded, +/obj/item/clothing/head/warden/inteq, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"B" = ( +/obj/machinery/power/port_gen/pacman/super{ + anchored = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/button/door{ + dir = 4; + id = "iron_maiden_eng"; + name = "Двигательные задвижки"; + pixel_x = -23 + }, +/obj/machinery/light_switch{ + pixel_x = -22; + dir = 4; + pixel_y = 9 + }, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"C" = ( +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/bridge) +"D" = ( +/obj/machinery/porta_turret/ship/inteq{ + dir = 9; + id = "iron2_turrets" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"E" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/opaque/solgovgold/arrow_cw, +/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/docking_port/stationary{ + dwidth = 15; + height = 15; + width = 30; + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"F" = ( +/obj/structure/catwalk, +/turf/open/floor/engine/hull/reinforced, +/area/ship/bridge) +"G" = ( +/turf/open/floor/plasteel/mono/white, +/area/ship/bridge) +"H" = ( +/obj/effect/turf_decal/borderfloorwhite, +/obj/structure/closet/secure_closet/wall{ + icon_door = "med_wall"; + name = "medical locker"; + req_access_txt = "5"; + dir = 8; + pixel_x = -28 + }, +/obj/item/storage/firstaid/advanced{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/stack/medical/splint{ + pixel_x = 6 + }, +/obj/item/storage/pill_bottle/iron{ + pixel_x = 6 + }, +/obj/item/defibrillator/loaded, +/obj/item/roller, +/obj/item/clothing/under/syndicate/inteq/corpsman/skirt, +/obj/item/gun/energy/e_gun/mini, +/obj/item/clothing/under/syndicate/inteq/corpsman, +/obj/item/clothing/head/soft/inteq/corpsman, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/suit/armor/inteq/corpsman, +/obj/item/storage/backpack/satchel/med, +/obj/item/storage/belt/medical/webbing, +/obj/item/clothing/shoes/combat, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/storage/case/surgery, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"I" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/storage/toolbox/mechanical/old, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"J" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"K" = ( +/obj/machinery/porta_turret/ship/inteq{ + dir = 10; + id = "iron2_turrets" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"L" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"M" = ( +/obj/structure/marker_beacon{ + picked_color = "Lime" + }, +/obj/structure/catwalk, +/turf/open/floor/engine/hull/reinforced, +/area/ship/bridge) +"N" = ( +/obj/effect/turf_decal/siding/brown, +/obj/item/flashlight/seclite, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/helmet/swat/inteq, +/obj/item/clothing/suit/armor/vest/inteq, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/security/webbing/inteq/alt, +/obj/item/clothing/gloves/combat, +/obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/radio/headset/inteq, +/obj/structure/closet/secure_closet/wall{ + icon_state = "generic_wall"; + name = "equipment locker"; + pixel_y = -28 + }, +/obj/item/gun/ballistic/automatic/pistol/glock, +/obj/item/gun/ballistic/automatic/assault/g36/inteq, +/obj/item/ammo_box/magazine/g36, +/obj/item/ammo_box/magazine/g36, +/obj/item/ammo_box/magazine/g36, +/obj/item/ammo_box/magazine/g36, +/obj/item/ammo_box/a556_box, +/obj/item/ammo_box/a556_box, +/obj/item/ammo_box/a556_box, +/obj/item/ammo_box/a556_box, +/obj/item/ammo_box/a556_box, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"O" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"P" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4; + name = "Helm" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/window/plasma/reinforced/spawner/west, +/turf/open/floor/plating, +/area/ship/bridge) +"Q" = ( +/obj/machinery/porta_turret/ship/inteq{ + id = "iron2_turrets" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"R" = ( +/obj/machinery/suit_storage_unit/inherit{ + req_access_txt = "147" + }, +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/mask/gas/sechailer, +/obj/effect/turf_decal/siding/brown, +/obj/structure/sign/poster/contraband/inteq{ + pixel_y = -32 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"S" = ( +/obj/structure/grille, +/turf/open/space/basic, +/area/ship/bridge) +"T" = ( +/obj/machinery/power/terminal, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"U" = ( +/obj/machinery/suit_storage_unit/inherit{ + req_access_txt = "147" + }, +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/mask/gas/sechailer, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/inteq{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"V" = ( +/obj/structure/curtain/bounty, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"W" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) +"X" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/button/door{ + name = "Cargo Doors"; + id = "Iron_maiden_cargo"; + dir = 4; + pixel_x = -20; + req_access_txt = "12"; + req_ship_access = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/structure/chair/comfy/shuttle, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Y" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor{ + id = "iron_maiden_eng"; + name = "Engine Blast Door" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating/ship, +/area/ship/bridge) +"Z" = ( +/turf/open/floor/plasteel/patterned/ridged, +/area/ship/bridge) + +(1,1,1) = {" +M +Z +e +E +e +Z +M +"} +(2,1,1) = {" +D +y +O +m +O +y +K +"} +(3,1,1) = {" +C +b +X +g +T +u +S +"} +(4,1,1) = {" +v +O +U +q +R +O +v +"} +(5,1,1) = {" +F +O +d +f +N +O +F +"} +(6,1,1) = {" +t +O +O +k +O +O +a +"} +(7,1,1) = {" +Y +W +B +J +H +h +p +"} +(8,1,1) = {" +O +L +I +s +z +G +Q +"} +(9,1,1) = {" +O +o +P +j +O +V +O +"} +(10,1,1) = {" +O +w +c +A +O +r +O +"} +(11,1,1) = {" +l +O +x +i +O +O +n +"} From 0ed6131c73e43eb905771637e2c4f27815a65327 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 17:57:57 +0500 Subject: [PATCH 02/10] Update inteq_tapok.dmm --- _maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm index 728f410085af..607f7cfd1f88 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -332,7 +332,7 @@ /obj/structure/marker_beacon{ picked_color = "Lime" }, -/turf/open/floor/engine/hull/reinforced, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "w" = ( /obj/structure/table/reinforced, @@ -451,7 +451,7 @@ /area/ship/bridge) "F" = ( /obj/structure/catwalk, -/turf/open/floor/engine/hull/reinforced, +/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "G" = ( /turf/open/floor/plasteel/mono/white, @@ -561,11 +561,6 @@ /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, -/obj/item/ammo_box/a556_box, -/obj/item/ammo_box/a556_box, -/obj/item/ammo_box/a556_box, -/obj/item/ammo_box/a556_box, -/obj/item/ammo_box/a556_box, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "O" = ( From 7f8a6fa397ca975a2034304e62838d7227221225 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 17:58:22 +0500 Subject: [PATCH 03/10] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 196353141536..3231dbcd3f09 100644 --- a/.gitignore +++ b/.gitignore @@ -202,3 +202,5 @@ check_regex_output.txt # Autowiki /tools/autowiki/node_modules +shiza.dmm +Sandbox.dmm From 09226c7e89792416ddf3523fe6e43d9f5212a151 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 18:08:00 +0500 Subject: [PATCH 04/10] Update inteq_tapok.dmm --- .../shuttles/inteq/inteq_tapok.dmm | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm index 607f7cfd1f88..3f8da23eff55 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -60,11 +60,6 @@ pixel_y = 28; dir = 1 }, -/obj/item/gun/ballistic/automatic/pistol/glock, -/obj/item/ammo_box/magazine/smgm10mm, -/obj/item/ammo_box/magazine/smgm10mm, -/obj/item/ammo_box/magazine/smgm10mm, -/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq, /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/power/terminal{ dir = 4 @@ -72,6 +67,14 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/item/clothing/suit/armor/vest/inteq, +/obj/item/storage/belt/security/webbing/inteq/alt, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/suit/space/inteq, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "e" = ( @@ -136,6 +139,22 @@ req_ship_access = 1 }, /obj/machinery/holopad, +/obj/structure/closet/secure_closet/wall{ + icon_state = "generic_wall"; + name = "equipment locker"; + pixel_y = -28 + }, +/obj/item/storage/ration/fish_stew, +/obj/item/storage/ration/fried_fish, +/obj/item/storage/ration/pepperoni_pizza_slice, +/obj/item/storage/ration/elbow_macaroni, +/obj/item/storage/ration/crayons, +/obj/item/storage/ration/cheese_pizza_slice, +/obj/item/storage/ration/blackened_calamari, +/obj/item/storage/ration/beef_strips, +/obj/item/storage/ration/beef_goulash, +/obj/item/storage/ration/assorted_salted_offal, +/obj/item/storage/ration/shredded_beef, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "k" = ( @@ -295,6 +314,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/item/stack/cable_coil/red, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "t" = ( @@ -386,12 +406,10 @@ }, /obj/effect/turf_decal/corner/opaque/yellow, /obj/machinery/light/directional/south, -/obj/item/gun/ballistic/automatic/pistol/usp45, /obj/item/storage/box/ammo/a357, /obj/item/melee/baton/loaded, /obj/item/clothing/head/warden/inteq, /obj/item/clothing/suit/armor/vest/security/warden/inteq, -/obj/item/clothing/suit/armor/vest/security/warden/inteq, /turf/open/floor/plasteel/tech, /area/ship/bridge) "B" = ( @@ -417,7 +435,10 @@ /obj/machinery/power/terminal{ dir = 1 }, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, /area/ship/bridge) "C" = ( /obj/structure/grille, @@ -540,27 +561,20 @@ "N" = ( /obj/effect/turf_decal/siding/brown, /obj/item/flashlight/seclite, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/helmet/swat/inteq, -/obj/item/clothing/suit/armor/vest/inteq, -/obj/item/clothing/shoes/combat, -/obj/item/storage/belt/security/webbing/inteq/alt, -/obj/item/clothing/gloves/combat, -/obj/item/storage/belt/security/webbing/inteq, /obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/radio/headset/inteq, -/obj/structure/closet/secure_closet/wall{ - icon_state = "generic_wall"; - name = "equipment locker"; - pixel_y = -28 - }, /obj/item/gun/ballistic/automatic/pistol/glock, /obj/item/gun/ballistic/automatic/assault/g36/inteq, /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, +/obj/structure/closet/secure_closet/lethalshots, +/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/ammo_box/magazine/smgm10mm, +/obj/item/gun/ballistic/automatic/pistol/glock, +/obj/item/gun/ballistic/automatic/pistol/usp45, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "O" = ( @@ -594,6 +608,7 @@ pixel_y = -32 }, /obj/machinery/light/directional/south, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "S" = ( @@ -622,10 +637,12 @@ /obj/effect/turf_decal/siding/brown{ dir = 1 }, -/obj/structure/sign/poster/contraband/inteq{ - pixel_y = 32 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/sign/poster/contraband/inteq_gec{ + pixel_x = 1; + pixel_y = 30 + }, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "V" = ( From 09574110a1b31b8d36cd7818de7e10e0a98f7811 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 18:25:30 +0500 Subject: [PATCH 05/10] Update inteq_tapok.dmm --- .../shuttles/inteq/inteq_tapok.dmm | 65 ++++++++++++------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm index 3f8da23eff55..f0be9ab23622 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -139,22 +139,21 @@ req_ship_access = 1 }, /obj/machinery/holopad, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/structure/closet/secure_closet/wall{ icon_state = "generic_wall"; name = "equipment locker"; pixel_y = -28 }, -/obj/item/storage/ration/fish_stew, -/obj/item/storage/ration/fried_fish, -/obj/item/storage/ration/pepperoni_pizza_slice, -/obj/item/storage/ration/elbow_macaroni, -/obj/item/storage/ration/crayons, -/obj/item/storage/ration/cheese_pizza_slice, -/obj/item/storage/ration/blackened_calamari, -/obj/item/storage/ration/beef_strips, -/obj/item/storage/ration/beef_goulash, -/obj/item/storage/ration/assorted_salted_offal, -/obj/item/storage/ration/shredded_beef, +/obj/item/clothing/suit/armor/vest/security/warden/inteq, +/obj/item/clothing/head/warden/inteq, +/obj/item/melee/baton/loaded, +/obj/item/storage/box/ammo/a357, +/obj/item/clothing/mask/gas/sechailer, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/hardsuit/syndi/inteq, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "k" = ( @@ -169,6 +168,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "l" = ( @@ -195,9 +200,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/effect/turf_decal/trimline/opaque/solgovgold/arrow_ccw{ dir = 1 }, @@ -395,21 +397,14 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "A" = ( -/obj/machinery/suit_storage_unit/inherit{ - req_access_txt = "147;148" - }, -/obj/item/clothing/suit/space/hardsuit/syndi/inteq, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/mask/gas/sechailer, /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/yellow, /obj/machinery/light/directional/south, -/obj/item/storage/box/ammo/a357, -/obj/item/melee/baton/loaded, -/obj/item/clothing/head/warden/inteq, -/obj/item/clothing/suit/armor/vest/security/warden/inteq, +/obj/machinery/computer/cargo{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "B" = ( @@ -568,13 +563,15 @@ /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36, -/obj/structure/closet/secure_closet/lethalshots, /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq, /obj/item/ammo_box/magazine/smgm10mm, /obj/item/ammo_box/magazine/smgm10mm, /obj/item/ammo_box/magazine/smgm10mm, /obj/item/gun/ballistic/automatic/pistol/glock, /obj/item/gun/ballistic/automatic/pistol/usp45, +/obj/structure/closet/secure_closet/empty/warden{ + name = "\proper Weapons Locker" + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "O" = ( @@ -647,6 +644,24 @@ /area/ship/bridge) "V" = ( /obj/structure/curtain/bounty, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/closet/secure_closet/wall{ + icon_state = "generic_wall"; + name = "equipment locker"; + pixel_y = -28 + }, +/obj/item/storage/ration/assorted_salted_offal, +/obj/item/storage/ration/beef_strips, +/obj/item/storage/ration/chili_macaroni, +/obj/item/storage/ration/crayons, +/obj/item/storage/ration/lemon_pepper_chicken, +/obj/item/storage/ration/vegan_chili, +/obj/item/storage/ration/vegan_chili, +/obj/item/storage/ration/shredded_beef, +/obj/item/storage/ration/sausage_peppers_onions, +/obj/item/storage/ration/fish_stew, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "W" = ( From e90f674f7182a8be8c29cf07d945b81957d8dfe2 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 18:45:55 +0500 Subject: [PATCH 06/10] Update inteq_tapok.json --- _maps/_mod_celadon/configs/inteq_tapok.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/_mod_celadon/configs/inteq_tapok.json b/_maps/_mod_celadon/configs/inteq_tapok.json index c7c923a7fcb1..bec5b7162296 100644 --- a/_maps/_mod_celadon/configs/inteq_tapok.json +++ b/_maps/_mod_celadon/configs/inteq_tapok.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Tapok-class Assault Box Mk.III", "map_short_name": "Inteq-Tapok", - "description": "Боевое судно класса тапок, создан как абсурдно более дешевая замена кораблям класса Iron-Maiden в связи с урезкой бюджета после потери десятков суден идиотами которые пытались бодаться против АСТЕРОИДОВ. Из-за таких уникумов, организация вынуждена показать ценность данных ресурсов иным способом", + "description": "Боевое судно класса тапок, создан как абсурдно более дешевая замена кораблям класса Iron-Maiden в связи с урезкой бюджета после потери десятков суден идиотами, которые пытались бодаться против АСТЕРОИДОВ. Из-за таких уникумов, организация вынуждена показать ценность данных ресурсов иным способом", "map_path": "_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm", "enabled": true, "limit": 1, From 6beaa0b5a50869e170fd1cf77dd68f7de012d71e Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 19:09:11 +0500 Subject: [PATCH 07/10] Update inteq_tapok.dmm --- _maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm index f0be9ab23622..ef3796373d24 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -608,10 +608,6 @@ /obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) -"S" = ( -/obj/structure/grille, -/turf/open/space/basic, -/area/ship/bridge) "T" = ( /obj/machinery/power/terminal, /obj/machinery/firealarm/directional/west, @@ -744,7 +740,7 @@ X g T u -S +C "} (4,1,1) = {" v From acf73813ab817c7e890f0125971bf266f5a7c769 Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 19:12:08 +0500 Subject: [PATCH 08/10] Update inteq_tapok.dmm --- _maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm index ef3796373d24..b43819a77b7c 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm @@ -284,6 +284,7 @@ id = "iron_maiden_eng"; name = "Engine Blast Door" }, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/ship, /area/ship/bridge) "q" = ( @@ -672,6 +673,9 @@ icon_state = "1-4" }, /obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "X" = ( @@ -697,7 +701,9 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "Y" = ( -/obj/machinery/power/smes/shuttle/precharged, +/obj/machinery/power/smes/shuttle/precharged{ + dir = 2 + }, /obj/structure/cable{ icon_state = "0-8" }, From bc16007f313f8dfe8bbe7389be6326fe6379943d Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Fri, 24 Jan 2025 19:18:58 +0500 Subject: [PATCH 09/10] Revert "Update .gitignore" This reverts commit 7f8a6fa397ca975a2034304e62838d7227221225. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3231dbcd3f09..196353141536 100644 --- a/.gitignore +++ b/.gitignore @@ -202,5 +202,3 @@ check_regex_output.txt # Autowiki /tools/autowiki/node_modules -shiza.dmm -Sandbox.dmm From 6271d706048cba2749de9ae53075b0c5594a170d Mon Sep 17 00:00:00 2001 From: PepegaSandwich Date: Sat, 25 Jan 2025 23:37:48 +0500 Subject: [PATCH 10/10] to shitspawn --- _maps/_mod_celadon/configs/inteq_tapok.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/_mod_celadon/configs/inteq_tapok.json b/_maps/_mod_celadon/configs/inteq_tapok.json index bec5b7162296..df0f952f7d4c 100644 --- a/_maps/_mod_celadon/configs/inteq_tapok.json +++ b/_maps/_mod_celadon/configs/inteq_tapok.json @@ -4,7 +4,7 @@ "map_short_name": "Inteq-Tapok", "description": "Боевое судно класса тапок, создан как абсурдно более дешевая замена кораблям класса Iron-Maiden в связи с урезкой бюджета после потери десятков суден идиотами, которые пытались бодаться против АСТЕРОИДОВ. Из-за таких уникумов, организация вынуждена показать ценность данных ресурсов иным способом", "map_path": "_maps/_mod_celadon/shuttles/inteq/inteq_tapok.dmm", - "enabled": true, + "enabled": false, "limit": 1, "prefix": "LIQSV", "faction": "/datum/faction/inteq",