cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MODULAR] Tarkon Tideovers (Ready for Review) (#14847)

Browse Source 
* Dirt Halfing, Cell Charging and PACMAN DeShittening

* access fix

* Why were access revamped?

* I HATE REVAMPS I HATE REVAMPS I HATE REVAMPS I HATE REVAMPS I HATE REVAM

* IHATEMISCLICKSIHATEMISCLICKSIHATEMISCLICKSIHATEMISCLICKSIHATEMISCLICKS

* NIGHTMARENIGHTMARENIGHTMARENIGHTMARENIGHTMARENIGHTMARENIGHTMARENIGHTMARE

* ok genuinely, i didnt know we had one. it wasn't where i was looking.

* YOU GET A REFACTOR, YOU GET A REFACTOR, YOU ALL GET A REFACTOR! AAAAAAAA

* minor (but good) change to get the checks to redo

* Future proofing for TarkOnIce

* AAAAAAAAAAA taking out a slash AAAAAAAAAAAA

* My brain is so big its creating its own gravity and squashing itself.

* BIG BRAIN
This commit is contained in:
Zenitheevee
2022-07-16 15:55:34 -04:00
committed by GitHub
parent 97fcd813c5
commit 81d0741a0f
8 changed files with 174 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
+137 -145
View File
@@ -36,7 +36,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/machinery/door/airlock/engineering/glass{
name = "P-T Tool Storage"
},
@@ -185,12 +185,13 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/trauma)
"bg" = (
/obj/machinery/door/airlock/security/old,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/security/old,
/obj/effect/mapping_helpers/airlock/access/all/tarkon/general,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/secoff)
"bi" = (
@@ -221,12 +222,12 @@
/obj/machinery/button/door/incinerator_vent_atmos_aux{
pixel_x = -8;
pixel_y = -24;
req_one_access = list(200)
req_one_access = list("tarkon")
},
/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = -8;
pixel_y = -36;
req_one_access = list(200)
req_one_access = list("tarkon")
},
/obj/machinery/atmospherics/components/binary/pump/off/general{
dir = 8
@@ -282,7 +283,7 @@
/turf/closed/wall,
/area/ruin/space/has_grav/port_tarkon/power1)
"bA" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/garden)
"bD" = (
@@ -504,9 +505,7 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"cX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
@@ -544,10 +543,8 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"dg" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/porthall)
"dh" = (
@@ -558,9 +555,7 @@
/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
@@ -737,7 +732,7 @@
name = "Crew Storage"
},
/obj/effect/decal/cleanable/blood/tracks,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon)
"eg" = (
@@ -856,7 +851,7 @@
"eL" = (
/obj/machinery/door/airlock/public,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/structure/alien/weeds/node,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/observ)
@@ -910,7 +905,7 @@
name = "Starboard Primary Hallway"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"ff" = (
@@ -999,7 +994,8 @@
/turf/open/misc/asteroid/airless,
/area/solars/tarkon)
"fB" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/cargo)
"fC" = (
@@ -1145,7 +1141,8 @@
/area/ruin/space/has_grav/port_tarkon/garden)
"gp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"gs" = (
@@ -1198,10 +1195,9 @@
/area/ruin/space/has_grav/port_tarkon/mining)
"gA" = (
/obj/machinery/door/airlock/mining/glass,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/heavy/closed,
/obj/effect/turf_decal/sand/plating,
/obj/effect/mapping_helpers/airlock/access/all/tarkon/general,
/turf/open/misc/asteroid,
/area/ruin/space/has_grav/port_tarkon/mining)
"gD" = (
@@ -1221,7 +1217,8 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/observ)
"gJ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/garden)
"gN" = (
@@ -1348,7 +1345,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon)
"hu" = (
@@ -1387,9 +1384,7 @@
/obj/structure/barricade/wooden/crude,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/porthall)
@@ -1461,7 +1456,7 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"hQ" = (
/obj/machinery/door/airlock/mining,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1487,7 +1482,7 @@
/area/ruin/space/has_grav/port_tarkon/kitchen)
"hY" = (
/obj/machinery/door/window/brigdoor/security/cell/right/directional/south{
req_access = list(210)
req_access = list("tarkon")
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1545,6 +1540,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"iq" = (
@@ -1591,7 +1587,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/trauma)
@@ -1648,7 +1644,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"iU" = (
@@ -1815,10 +1811,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/science,
/obj/item/areaeditor/blueprints/slime,
/obj/item/slime_extract,
/obj/item/slime_extract,
/obj/item/slime_extract,
/obj/effect/turf_decal/tile/brown/anticorner,
/obj/item/slime_extract/grey,
/obj/item/slime_extract/grey,
/obj/item/slime_extract/grey,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/port_tarkon/storage)
"jV" = (
@@ -2142,7 +2138,7 @@
/area/ruin/space/has_grav/port_tarkon/observ)
"ls" = (
/obj/machinery/door/window/brigdoor/security/cell{
req_access = list(210)
req_access = list("tarkon")
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2165,11 +2161,12 @@
name = "Aft Primary Hallway"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/afthall)
"ly" = (
/obj/effect/spawner/structure/window,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon)
"lA" = (
@@ -2192,6 +2189,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/dorms)
"lE" = (
@@ -2237,7 +2235,7 @@
/obj/machinery/door/airlock/multi_tile/glass{
dir = 8
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/garden)
"lS" = (
@@ -2274,10 +2272,11 @@
/area/ruin/space/has_grav/port_tarkon/toolstorage)
"lV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/brown/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"lW" = (
@@ -2393,7 +2392,7 @@
name = "Cryogenics Room"
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon)
"mD" = (
@@ -2457,15 +2456,16 @@
/obj/machinery/door/airlock/public/glass{
name = "Starboard Primary Hallway"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"mV" = (
/obj/machinery/door/window/right/directional/east,
/obj/machinery/door/window/right/directional/west,
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"mZ" = (
@@ -2482,7 +2482,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"nc" = (
@@ -2889,7 +2889,7 @@
/obj/machinery/door/airlock/multi_tile/glass{
dir = 4
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/garden)
"pA" = (
@@ -2963,7 +2963,8 @@
"pW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/port_gen/pacman/super{
name = "\improper emergency power generator"
name = "\improper emergency power generator";
time_per_sheet = 40
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
@@ -3281,9 +3282,7 @@
"rP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/forehall)
"rV" = (
@@ -3527,10 +3526,11 @@
/area/ruin/space/has_grav/port_tarkon/forehall)
"ts" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/purple/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"tt" = (
@@ -3576,7 +3576,8 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/porthall)
"tH" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"tI" = (
@@ -3594,6 +3595,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/dorms)
"tQ" = (
@@ -3654,10 +3656,11 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"ub" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/yellow/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"ud" = (
@@ -3794,6 +3797,11 @@
"uR" = (
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"uS" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/secoff)
"uU" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 5
@@ -3834,6 +3842,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/dorms)
"vj" = (
@@ -4167,10 +4176,11 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"xp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/green/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"xq" = (
@@ -4433,11 +4443,13 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/trauma)
"yU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/mining)
"yY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/toolstorage)
"zb" = (
@@ -4609,7 +4621,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/power1)
"Az" = (
@@ -4663,9 +4675,7 @@
/area/ruin/space/has_grav/port_tarkon/power1)
"AN" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/porthall)
"AP" = (
@@ -4691,10 +4701,11 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"Bj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/cyan/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"Bk" = (
@@ -4707,7 +4718,7 @@
/obj/machinery/door/airlock/public{
name = "Kitchen Freezer"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron/freezer,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"Bo" = (
@@ -4721,12 +4732,12 @@
/area/ruin/space/has_grav/port_tarkon/mining)
"Bp" = (
/obj/structure/window/reinforced/tinted,
/obj/structure/closet/secure_closet/medical1,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/blue/half{
dir = 8
},
/obj/item/circuitboard/machine/sleeper,
/obj/structure/closet/secure_closet/medical1,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/trauma)
"Bq" = (
@@ -4760,9 +4771,7 @@
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
"BJ" = (
@@ -4789,10 +4798,10 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/power1)
"BU" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"BV" = (
@@ -4867,18 +4876,12 @@
"Ck" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/stock_parts/cell{
charge = 100;
maxcharge = 15000
},
/obj/item/stock_parts/cell{
charge = 100;
maxcharge = 15000
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/anticorner{
dir = 8
},
/obj/item/stock_parts/cell/high,
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/power1)
"Cm" = (
@@ -4911,9 +4914,7 @@
/obj/effect/turf_decal/sand,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
@@ -4949,6 +4950,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/port_tarkon/dorms)
"CA" = (
@@ -5002,12 +5004,10 @@
"CL" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/airlock/mining/glass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"CM" = (
@@ -5131,6 +5131,11 @@
/obj/item/mod/module/visor/rave,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/cargo)
"Dn" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"Dv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5275,9 +5280,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/public/glass{
name = "Port Primary Hallway"
},
@@ -5363,7 +5366,8 @@
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/port_tarkon/storage)
"EQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/obj/machinery/door/poddoor/shutters{
id = "ptobservatory"
},
@@ -5401,7 +5405,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Crew Storage"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon)
"Fh" = (
@@ -5620,7 +5624,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/blue/half,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/comms)
"Gl" = (
@@ -5766,7 +5770,8 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"Ha" = (
/obj/machinery/power/port_gen/pacman/super{
name = "\improper emergency power generator"
name = "\improper emergency power generator";
time_per_sheet = 40
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/greenglow,
@@ -5858,7 +5863,7 @@
/area/ruin/space/has_grav/port_tarkon/mining)
"HQ" = (
/obj/machinery/door/airlock/research,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5882,7 +5887,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/observ)
"HX" = (
@@ -5934,10 +5939,8 @@
/turf/open/misc/asteroid/airless,
/area/solars/tarkon)
"Ih" = (
/obj/machinery/door/airlock/glass_large,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/airlock/multi_tile/glass,
/obj/machinery/door/firedoor/solid/closed,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6005,7 +6008,7 @@
/area/ruin/space/has_grav/port_tarkon/storage)
"IB" = (
/obj/machinery/door/airlock/research,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/developement)
"IC" = (
@@ -6297,7 +6300,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/afthall)
"JX" = (
@@ -6310,7 +6313,7 @@
"JY" = (
/obj/structure/window/reinforced/tinted,
/obj/structure/closet/secure_closet/medical2{
req_access = list(5)
req_access = list("medical")
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/blue/half{
@@ -6369,6 +6372,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"Kl" = (
@@ -6411,11 +6415,8 @@
/area/ruin/space/has_grav/port_tarkon/centerhall)
"KB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/mining/glass,
/obj/structure/alien/weeds/node,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"KE" = (
@@ -6575,7 +6576,7 @@
/area/ruin/space/has_grav/port_tarkon/mining)
"Lr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/trauma)
@@ -6743,7 +6744,7 @@
/obj/machinery/door/airlock{
name = "Bathroom"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/centerhall)
"MD" = (
@@ -6832,9 +6833,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
@@ -6921,10 +6920,11 @@
/area/ruin/space/has_grav/port_tarkon/observ)
"NK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/dark/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"NL" = (
@@ -7164,9 +7164,7 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/mining)
"Pq" = (
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/storage)
"Ps" = (
@@ -7190,7 +7188,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/garden)
"Pz" = (
@@ -7224,9 +7222,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/atmos/glass,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/port_tarkon/atmos)
@@ -7291,10 +7287,11 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"Qg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/layer_manifold/pink/hidden{
dir = 4
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"Qh" = (
@@ -7334,9 +7331,7 @@
name = "Port Primary Hallway"
},
/obj/structure/barricade/wooden/crude,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/porthall)
"Qu" = (
@@ -7352,7 +7347,8 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/atmos)
"Qx" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/power1)
"Qy" = (
@@ -7369,7 +7365,7 @@
/obj/machinery/door/window/left/directional/north,
/obj/machinery/door/window/left/directional/south,
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/cargo)
"QB" = (
@@ -7498,7 +7494,7 @@
/area/ruin/space/has_grav/port_tarkon/mining)
"Rr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/machinery/door/airlock/engineering/glass{
name = "P-T Tool Storage"
},
@@ -7700,7 +7696,7 @@
/obj/effect/turf_decal/tile/blue/half{
dir = 1
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/comms)
"Su" = (
@@ -7863,9 +7859,7 @@
/area/ruin/space/has_grav/port_tarkon/comms)
"Tl" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/forehall)
"To" = (
@@ -7906,7 +7900,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Kitchen"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/kitchen)
"TF" = (
@@ -8127,7 +8121,8 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
"US" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/solid,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/starboardhall)
"UV" = (
@@ -8270,10 +8265,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
"VN" = (
@@ -8376,7 +8369,7 @@
/obj/machinery/computer/cryopod{
dir = 4;
pixel_x = -24;
req_one_access = list(66)
req_one_access = list("tarkon")
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8441,9 +8434,7 @@
/area/ruin/space/has_grav/port_tarkon/atmos)
"WE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/forehall)
"WJ" = (
@@ -8467,8 +8458,9 @@
/area/ruin/space/has_grav/port_tarkon/centerhall)
"WP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor/solid/closed,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/atmos)
"WQ" = (
@@ -8510,7 +8502,7 @@
/area/ruin/space/has_grav/port_tarkon/developement)
"Xj" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon/garden)
"Xn" = (
@@ -8587,9 +8579,7 @@
"XJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
/obj/machinery/door/firedoor/closed{
opacity = 1
},
/obj/machinery/door/firedoor/solid/closed,
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
@@ -8731,7 +8721,8 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"YK" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/comms)
"YT" = (
@@ -8859,7 +8850,8 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"ZM" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/firedoor/solid,
/turf/open/floor/plating,
/area/ruin/space/has_grav/port_tarkon/afthall)
"ZN" = (
@@ -8875,7 +8867,7 @@
"ZU" = (
/obj/machinery/door/airlock/mining/glass,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -8901,7 +8893,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/machinery/door/firedoor/solid,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/port_tarkon)
@@ -12528,7 +12520,7 @@ LY
zt
Hf
Yu
gD
uS
Bg
Cv
vn
@@ -12601,9 +12593,9 @@ qQ
Hk
Hf
Ud
gD
uS
iT
US
Dn
mT
gJ
gJ
@@ -12674,7 +12666,7 @@ bY
zt
lW
aU
gD
uS
Bg
Bg
MF
code/__DEFINES/~skyrat_defines/access.dm
+1
View File
@@ -1 +1,2 @@
#define ACCESS_BARBER 73
#define ACCESS_TARKON "tarkon"
modular_skyrat/master_files/code/game/machinery/doors/firedoor.dm
+18
View File
@@ -25,3 +25,21 @@
open()
else
close()
/obj/machinery/door/firedoor/heavy/closed
icon_state = "door_closed"
density = TRUE
alarm_type = FIRELOCK_ALARM_TYPE_GENERIC
/obj/machinery/door/firedoor/solid
name = "solid emergency shutter"
desc = "Emergency air-tight shutter, capable of sealing off breached areas. It has a mechanism to open it with just your hands."
icon = 'modular_skyrat/modules/aesthetics/firedoor/icons/firedoor.dmi'
glass = FALSE
/obj/machinery/door/firedoor/solid/closed
icon_state = "door_closed"
density = TRUE
opacity = TRUE
alarm_type = FIRELOCK_ALARM_TYPE_GENERIC
modular_skyrat/modules/mapping/code/fluff.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/item/card/id/away/tarkon
name = "Tarkon visitor's pass"
desc = "A dust-collected visitors pass, A small tagline reading \"Port Tarkon, The first step to Civilian Partnership in Space Homesteading\"."
trim = /datum/id_trim/away/old
trim = /datum/id_trim/away/tarkon
/* ----------------- Lore ----------------- */
//Tape subtype for adding ruin lore -- the variables below are the ones you need to change
modular_skyrat/modules/mapping/code/misc.dm
+1 -1
View File
@@ -23,7 +23,7 @@
mod_type = /obj/item/mod/control/pre_equipped/prototype/hauler
/obj/item/areaeditor/blueprints/tarkon
desc = "Blueprints of the Tarkon drill and several base designs for it. Red, stamped text reads \"Confidential\" on the backside of it."
desc = "Blueprints of the Tarkon surface breaching drill and several Tarkon base designs. Red, stamped text reads \"Confidential\" on the backside of it."
name = "Tarkon Design Prints"
/obj/item/mod/module/armor_booster/retractplates
modular_skyrat/modules/mapping/code/mob_spawns.dm
+6 -6
View File
@@ -268,7 +268,7 @@
)
id = /obj/item/card/id/away/silver/freightqm
//Port Tarkon, 5 people trapped in a revamped charlie-station like ghost role. Survive the aliens and threats, Fix the port and/or finish construction
//Port Tarkon, 6 people trapped in a revamped charlie-station like ghost role. Survive the aliens and threats, Fix the port and/or finish construction
/obj/effect/mob_spawn/ghost_role/human/tarkon
name = "P-T Abandoned Crew"
@@ -439,26 +439,26 @@
/datum/id_trim/away/tarkon
assignment = "P-T Cargo Personell"
access = list(66, ACCESS_AWAY_GENERAL)
access = list(ACCESS_AWAY_GENERAL, ACCESS_WEAPONS, ACCESS_TARKON)
/datum/id_trim/away/tarkon/sec
assignment = "P-T Port Guard"
access = list(66, ACCESS_AWAY_GENERAL, 210)
access = list(ACCESS_AWAY_GENERAL, ACCESS_WEAPONS, ACCESS_TARKON)
/datum/id_trim/away/tarkon/med
assignment = "P-T Trauma Medic"
access = list(5, 66, ACCESS_AWAY_GENERAL)
access = list(ACCESS_MEDICAL, ACCESS_AWAY_GENERAL, ACCESS_WEAPONS, ACCESS_TARKON)
/datum/id_trim/away/tarkon/eng
assignment = "P-T Maintenance Crew"
/datum/id_trim/away/tarkon/sci
assignment = "P-T Field Researcher"
access = list(29, 66, ACCESS_AWAY_GENERAL)
access = list(ACCESS_ROBOTICS, ACCESS_AWAY_GENERAL, ACCESS_WEAPONS, ACCESS_TARKON)
/datum/id_trim/away/tarkon/ensign
assignment = "Tarkon Ensign"
access = list(5, 29, 66, ACCESS_AWAY_GENERAL, 210)
access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS, ACCESS_AWAY_GENERAL, ACCESS_TARKON, ACCESS_WEAPONS)
/obj/item/card/id/away/tarkon/sci //original tarkon ID is defined in fluff
name = "P-T field researcher's access card"
modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm
+1 -1
View File
@@ -17,7 +17,7 @@
bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
bolt_type = BOLT_TYPE_OPEN
realistic = TRUE
dirt_modifier = 0.6
dirt_modifier = 0.3
projectile_damage_multiplier = 1
burst_size = 2
fire_delay = 1.9
modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm
+9
View File
@@ -93,3 +93,12 @@
var/list/access_list = ..()
access_list += ACCESS_BRIG_ENTRANCE
return access_list
// Port Tarkon
/obj/effect/mapping_helpers/airlock/access/all/tarkon
icon_state = "access_helper_syn"
/obj/effect/mapping_helpers/airlock/access/all/tarkon/general/get_access()
var/list/access_list = ..()
access_list += ACCESS_TARKON
return access_list