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

[MIRROR] Destroys /obj/vehicle/sealed/mecha/working with a W80 nuclear warhead [MDB IGNORE] (#22110)

Browse Source 
* Destroys /obj/vehicle/sealed/mecha/working with a W80 nuclear warhead (#76296)

## About The Pull Request

Title.

Also, fixes https://github.com/tgstation/tgstation/issues/75568 at the
request of @ TheVekter

## Why It's Good For The Game

This subtype only exists to append ore box behavior and is clearly a
relic of pre-2020 mechcode.
Keeping it around will only make it harder in the future to add new
mechs with ore box support.

## Changelog

🆑
fix: Clarke ore box now has a less confusing dump contents button.
/🆑

---------

Co-authored-by: san7890 <the@ san7890.com>

* Destroys /obj/vehicle/sealed/mecha/working with a W80 nuclear warhead

* updatepaths

---------

Co-authored-by: ChungusGamer666 <82850673+ChungusGamer666@users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-07-04 13:35:22 +00:00
committed by GitHub
co-authored by san7890 ChungusGamer666 Jolly-66
parent a1ea7f13db
commit fcaa706706
32 changed files with 1091 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/vehicle/sealed/mecha/working/ripley/mining,
/obj/vehicle/sealed/mecha/ripley/mining,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+1 -1
View File
@@ -279,7 +279,7 @@
/turf/open/floor/iron/smooth_large/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"NG" = (
/obj/vehicle/sealed/mecha/working/ripley,
/obj/vehicle/sealed/mecha/ripley,
/turf/open/floor/iron/recharge_floor/Airless,
/area/ruin/space/has_grav/powered/mechtransport)
"Oh" = (
_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm
+1 -1
View File
@@ -1173,7 +1173,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/vehicle/sealed/mecha/working/ripley/mk2,
/obj/vehicle/sealed/mecha/ripley/mk2,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/vaulttango)
"OL" = (
_maps/RandomZLevels/caves.dmm
+1 -1
View File
@@ -1113,7 +1113,7 @@
},
/area/awaymission/caves/bmp_asteroid)
"gC" = (
/obj/vehicle/sealed/mecha/working/ripley/mining,
/obj/vehicle/sealed/mecha/ripley/mining,
/turf/open/floor/iron/recharge_floor,
/area/awaymission/caves/bmp_asteroid)
"gF" = (
_maps/RandomZLevels/snowdin.dmm
+221 -221
View File
@@ -445,15 +445,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/research)
"bG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 5
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"bH" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
@@ -1354,6 +1345,13 @@
/obj/item/paper_bin,
/turf/open/floor/carpet,
/area/awaymission/snowdin/post/dorm)
"ec" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"ed" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -1365,13 +1363,6 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"ef" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"eh" = (
/obj/structure/bed,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -1526,6 +1517,12 @@
},
/turf/open/floor/carpet,
/area/awaymission/snowdin/post/dorm)
"eQ" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"eR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 6;
@@ -1728,6 +1725,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/carpet,
/area/awaymission/snowdin/post/dorm)
"ft" = (
/obj/structure/sign/poster/official/no_erp/directional/west,
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"fu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 8;
@@ -2440,6 +2445,21 @@
},
/turf/open/floor/carpet,
/area/awaymission/snowdin/post/dorm)
"hK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
piping_layer = 4;
pixel_x = 5;
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"hL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
@@ -3015,13 +3035,6 @@
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
"jc" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"je" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -3078,6 +3091,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"jn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"jo" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
@@ -3306,6 +3325,13 @@
"jR" = (
/turf/closed/wall/rust,
/area/awaymission/snowdin/post/custodials)
"jT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"jU" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -3442,13 +3468,6 @@
/obj/item/tank/internals/plasma,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
"ko" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"kr" = (
/obj/structure/fence{
dir = 4
@@ -3546,12 +3565,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/awaymission/snowdin/post/dorm)
"kD" = (
/obj/effect/turf_decal/tile/neutral{
"kF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
/area/awaymission/snowdin/post)
"kG" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -3750,6 +3769,13 @@
/obj/item/mop,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/post/custodials)
"ln" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"lo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 8;
@@ -4210,6 +4236,22 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/post/custodials)
"md" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
piping_layer = 4;
pixel_x = 5;
pixel_y = 5
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"me" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 1;
@@ -5187,6 +5229,15 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/secpost)
"pp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 5
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"pq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -6427,6 +6478,12 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"ux" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"uz" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
@@ -6453,6 +6510,12 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"uE" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"uF" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
@@ -6536,6 +6599,13 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/cavern1)
"vc" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"vd" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral,
@@ -7051,6 +7121,16 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"xS" = (
/obj/machinery/power/port_gen/pacman,
/obj/item/stack/sheet/mineral/plasma{
@@ -7245,6 +7325,16 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"yC" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"yD" = (
/obj/structure/fence{
pixel_x = 16
@@ -7533,12 +7623,6 @@
/obj/structure/rack,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"zO" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"zQ" = (
/obj/item/hatchet{
pixel_x = 4;
@@ -7694,6 +7778,12 @@
/obj/machinery/door/airlock/external/glass/ruin,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/minipost)
"Aw" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/minipost)
"Ax" = (
/obj/structure/chair/office{
dir = 4
@@ -8832,6 +8922,13 @@
/obj/structure/ore_box,
/turf/closed/mineral/snowmountain/cavern,
/area/awaymission/snowdin/cave/cavern)
"FU" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"FZ" = (
/turf/closed/wall/ice,
/area/awaymission/snowdin/post/mining_main)
@@ -8844,12 +8941,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"Gc" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"Gd" = (
/turf/closed/wall/ice,
/area/awaymission/snowdin/post/mining_main/robotics)
@@ -9013,16 +9104,6 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main/mechbay)
"GM" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"GN" = (
/turf/closed/wall,
/area/awaymission/snowdin/post/mining_main/mechbay)
@@ -9226,6 +9307,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"HE" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"HF" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"HG" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -9260,12 +9354,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/awaymission/snowdin/post/mining_main/robotics)
"HN" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"HO" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
@@ -9345,6 +9433,13 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/awaymission/snowdin/post/mining_main/robotics)
"Id" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"Ie" = (
/obj/structure/barricade/sandbags,
/obj/effect/mapping_helpers/broken_floor,
@@ -9386,11 +9481,6 @@
/obj/machinery/mech_bay_recharge_port,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/vehicle/sealed/mecha/working/ripley/mining,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/recharge_floor,
/area/awaymission/snowdin/post/mining_main/mechbay)
"Io" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -9413,6 +9503,12 @@
/obj/machinery/light/directional/west,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_main)
"Iu" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"Iv" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -9522,6 +9618,12 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"IT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"IU" = (
/obj/machinery/light/directional/south,
/obj/structure/table,
@@ -9631,13 +9733,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jo" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"Jp" = (
/obj/structure/closet/crate/preopen,
/obj/item/storage/toolbox/emergency,
@@ -9862,14 +9957,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/awaymission/snowdin/post/messhall)
"Ke" = (
/obj/structure/sign/poster/official/no_erp/directional/west,
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"Kg" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -10354,13 +10441,6 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/cafeteria,
/area/awaymission/snowdin/post/messhall)
"Mk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"Ml" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{
dir = 8
@@ -10638,12 +10718,6 @@
/obj/effect/spawner/random/exotic/antag_gear_weak,
/turf/open/misc/asteroid/snow,
/area/awaymission/snowdin/cave)
"NT" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"NV" = (
/obj/effect/turf_decal/weather/snow,
/obj/effect/turf_decal/weather/snow/corner{
@@ -10989,12 +11063,6 @@
slowdown = 1
},
/area/awaymission/snowdin/outside)
"Qb" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/minipost)
"Qc" = (
/obj/structure/flora/tree/stump,
/obj/effect/light_emitter{
@@ -11187,13 +11255,6 @@
"QS" = (
/turf/open/misc/ice/smooth,
/area/awaymission/snowdin/cave)
"QT" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"QU" = (
/obj/machinery/light/small/directional/south,
/obj/structure/rack,
@@ -11306,12 +11367,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/cafeteria,
/area/awaymission/snowdin/post/messhall)
"RJ" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"RN" = (
/obj/structure/flora/bush/snow/style_random,
/obj/effect/light_emitter{
@@ -11709,12 +11764,6 @@
slowdown = 1
},
/area/awaymission/snowdin/outside)
"TQ" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"TR" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -11862,29 +11911,6 @@
},
/turf/open/misc/asteroid/snow,
/area/awaymission/snowdin/outside)
"UD" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_main)
"UF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
piping_layer = 4;
pixel_x = 5;
pixel_y = 5
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"UG" = (
/obj/effect/light_emitter{
name = "outdoor light";
@@ -12103,12 +12129,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"Wg" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"Wh" = (
/obj/structure/bookcase/random,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -12226,6 +12246,13 @@
/obj/item/shard,
/turf/open/misc/ice/smooth,
/area/awaymission/snowdin/cave)
"WS" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/cavern1)
"WV" = (
/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{
@@ -12279,6 +12306,11 @@
},
/turf/open/misc/asteroid/snow,
/area/awaymission/snowdin/outside)
"Xr" = (
/obj/vehicle/sealed/mecha/ripley/mining,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/recharge_floor,
/area/awaymission/snowdin/post/mining_main/mechbay)
"Xt" = (
/obj/structure/rack,
/obj/item/storage/box/rubbershot,
@@ -12590,21 +12622,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/gateway)
"Zf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
dir = 4;
piping_layer = 4;
pixel_x = 5;
pixel_y = 5
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/dorm)
"Zj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
piping_layer = 4;
@@ -12617,16 +12634,6 @@
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/secpost)
"Zl" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post/mining_dock)
"Zn" = (
/obj/structure/flora/tree/pine/style_random,
/obj/effect/light_emitter{
@@ -12733,13 +12740,6 @@
},
/turf/open/misc/asteroid/snow,
/area/awaymission/snowdin/outside)
"ZO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/awaymission/snowdin/post)
"ZT" = (
/obj/structure/chair/stool/directional/west,
/turf/open/misc/asteroid/snow{
@@ -18434,13 +18434,13 @@ bQ
cp
cV
cv
ko
Wg
Ke
Wg
Wg
Zf
Wg
ec
eQ
ft
eQ
eQ
hK
eQ
je
aS
kw
@@ -21268,7 +21268,7 @@ gp
hg
hN
it
HN
jn
Wm
jR
jR
@@ -21526,10 +21526,10 @@ Zp
hO
iu
jm
Mk
NT
ZO
UF
jT
kF
ln
md
xw
QB
nF
@@ -23334,7 +23334,7 @@ nh
nJ
hM
oI
bG
pp
pN
dK
qM
@@ -23532,7 +23532,7 @@ GP
HD
GR
It
RJ
Iu
IR
Go
Is
@@ -23786,7 +23786,7 @@ FZ
Go
GP
Go
UD
HE
Gq
Xb
HW
@@ -24043,7 +24043,7 @@ Ga
PC
GQ
Hm
TQ
HF
HW
Gq
Gq
@@ -24304,7 +24304,7 @@ GR
HW
Gq
GR
kD
IT
IR
cG
Gq
@@ -24469,7 +24469,7 @@ zo
yW
zV
Ai
Qb
Aw
zp
AM
AZ
@@ -24817,7 +24817,7 @@ Go
GP
GP
Go
TQ
HF
Gq
IW
Rn
@@ -25073,7 +25073,7 @@ ae
ae
FZ
HY
RJ
Iu
IG
IS
Go
@@ -25329,7 +25329,7 @@ Zy
Zy
TI
Ga
TQ
HF
HW
HW
IU
@@ -25586,7 +25586,7 @@ Zy
TI
Qd
Ga
TQ
HF
GR
HW
IV
@@ -58482,9 +58482,9 @@ wT
xN
wL
xN
ef
ef
ef
Id
Id
Id
Jc
YA
JB
@@ -58990,7 +58990,7 @@ FD
FG
SQ
FM
Jo
FU
Gi
GE
Ha
@@ -59104,11 +59104,11 @@ ue
ue
tY
ul
zO
zO
zO
QT
QT
uE
uE
uE
vc
vc
ul
vB
tY
@@ -59360,7 +59360,7 @@ uc
UA
uk
ur
Gc
ux
uF
ul
ul
@@ -59874,7 +59874,7 @@ tY
ug
ul
tZ
jc
WS
PI
uK
PI
@@ -60648,8 +60648,8 @@ ul
uA
tY
vo
zO
QT
uE
vc
WG
vx
tY
@@ -61823,7 +61823,7 @@ GJ
He
HA
HO
In
Xr
GH
wL
wL
@@ -65067,7 +65067,7 @@ Ys
Ys
Ys
Ys
Zl
yC
yS
zm
zw
@@ -65324,7 +65324,7 @@ wW
Ys
Ys
Ys
Zl
yC
yT
wE
xW
@@ -65578,9 +65578,9 @@ xj
xu
xu
xu
GM
GM
GM
xQ
xQ
xQ
yE
yQ
wE
_maps/map_files/Deltastation/DeltaStation2.dmm
+352 -352
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+90 -90
View File
@@ -1411,15 +1411,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tcomms)
"aCy" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/obj/item/wallframe/digital_clock,
/obj/item/wallframe/digital_clock,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"aCE" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=10.1-Central-from-Aft";
@@ -3620,28 +3611,6 @@
/obj/structure/closet,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/aft)
"bor" = (
/obj/structure/table/wood/fancy/orange,
/obj/item/gps{
gpstag = "QM0";
pixel_x = 10;
pixel_y = 12
},
/obj/machinery/status_display/supply{
pixel_x = 32
},
/obj/item/storage/wallet{
pixel_x = -3;
pixel_y = 10
},
/obj/item/ammo_casing/rocket{
desc = "Your grandpappy brought this home after the war. You're pretty sure it's a dud.";
name = "Dud Rocket";
pixel_x = -4;
pixel_y = -7
},
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
"boD" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -4982,6 +4951,28 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
"bRQ" = (
/obj/structure/table/wood/fancy/orange,
/obj/item/gps{
gpstag = "QM0";
pixel_x = 10;
pixel_y = 12
},
/obj/machinery/status_display/supply{
pixel_x = 32
},
/obj/item/storage/wallet{
pixel_x = -3;
pixel_y = 10
},
/obj/item/ammo_casing/rocket{
desc = "Your grandpappy brought this home after the war. You're pretty sure it's a dud.";
name = "Dud Rocket";
pixel_x = -4;
pixel_y = -7
},
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/qm)
"bRT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25019,6 +25010,17 @@
},
/turf/open/floor/engine,
/area/station/science/cytology)
"jeG" = (
/obj/structure/rack,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/assembly/timer,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"jeI" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/siding/purple,
@@ -29681,6 +29683,11 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/service/hydroponics)
"kMQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/sealed/mecha/ripley/cargo,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
"kMX" = (
/obj/machinery/washing_machine,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -30764,6 +30771,12 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
"lfp" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/hangover,
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
"lfu" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32212,6 +32225,15 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"lKs" = (
/obj/machinery/chem_dispenser/drinks/beer{
dir = 1
},
/obj/structure/table,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/service/bar)
"lKu" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
@@ -32769,11 +32791,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white/side,
/area/station/medical/treatment_center)
"lTZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/sealed/mecha/working/ripley/cargo,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
"lUe" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/sign/poster/contraband/random/directional/north,
@@ -37496,6 +37513,16 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
"nzJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"nzP" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 10
@@ -41326,12 +41353,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"oUB" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/hangover,
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
"oUE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42318,6 +42339,15 @@
/obj/machinery/holopad,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
"pou" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods/fifty,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/obj/item/wallframe/digital_clock,
/obj/item/wallframe/digital_clock,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"poJ" = (
/obj/machinery/telecomms/hub/preset,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -46039,6 +46069,11 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
"qIc" = (
/obj/structure/cable,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/wood,
/area/station/service/library)
"qIl" = (
/turf/closed/wall,
/area/station/hallway/secondary/command)
@@ -47485,6 +47520,10 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"rhS" = (
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/wood,
/area/station/service/library)
"rhU" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/spawner/random/structure/crate,
@@ -50231,17 +50270,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"sfq" = (
/obj/structure/rack,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/assembly/timer,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"sfu" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden,
/turf/open/floor/iron/stairs/left{
@@ -52695,11 +52723,6 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/qm)
"sXE" = (
/obj/structure/cable,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/wood,
/area/station/service/library)
"sXF" = (
/obj/effect/turf_decal/trimline/purple/line{
dir = 1
@@ -59799,16 +59822,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/commons/dorms)
"vxE" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"vxJ" = (
/obj/machinery/power/emitter/welded{
dir = 1
@@ -62966,10 +62979,6 @@
dir = 1
},
/area/station/engineering/atmos/pumproom)
"wDH" = (
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/wood,
/area/station/service/library)
"wEf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{
dir = 1
@@ -64012,15 +64021,6 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"wYn" = (
/obj/machinery/chem_dispenser/drinks/beer{
dir = 1
},
/obj/structure/table,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/service/bar)
"wYo" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/light/directional/south,
@@ -85915,7 +85915,7 @@ mmR
nyk
qIK
hKq
bor
bRQ
iLV
mQR
lud
@@ -86963,7 +86963,7 @@ mjr
tbK
fZa
eXA
sXE
qIc
sVY
mjr
kUZ
@@ -87449,7 +87449,7 @@ hen
vzR
jDb
kod
lTZ
kMQ
vQs
aUj
rVK
@@ -87993,7 +87993,7 @@ mjr
nxz
ueD
sVY
wDH
rhS
rSx
pEH
pEH
@@ -91308,7 +91308,7 @@ iBq
mFi
iBq
iBq
vxE
nzJ
kON
fDc
oIa
@@ -91581,7 +91581,7 @@ iiE
rGj
rJr
pJR
oUB
lfp
qRI
urA
nIR
@@ -95688,7 +95688,7 @@ dUj
qVc
wNh
veO
sfq
jeG
duI
duI
wtX
@@ -101352,7 +101352,7 @@ pof
owi
nxA
hyX
wYn
lKs
eQE
eEf
rOM
@@ -101592,7 +101592,7 @@ wzK
qXB
mNj
wlL
aCy
pou
dZm
wAA
fRS
_maps/map_files/NorthStar/north_star.dmm
+49 -49
View File
@@ -438,6 +438,15 @@
/obj/effect/spawner/random/trash/botanical_waste,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/port)
"aeS" = (
/obj/machinery/newscaster/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/table/reinforced/rglass,
/obj/machinery/computer/records/medical/laptop,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"aeW" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -11887,15 +11896,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/wood,
/area/station/hallway/secondary/entry)
"cUK" = (
/obj/machinery/newscaster/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/table/reinforced/rglass,
/obj/machinery/computer/records/medical/laptop,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"cUL" = (
/turf/closed/wall,
/area/station/cargo/storage)
@@ -21179,6 +21179,15 @@
dir = 1
},
/area/station/service/chapel)
"fxc" = (
/obj/machinery/camera/autoname/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/table/reinforced/rglass,
/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"fxd" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/cleanable/dirt,
@@ -30869,6 +30878,16 @@
/obj/structure/cable,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
"hYB" = (
/obj/machinery/light/small/directional/north,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/machinery/digital_clock/directional/north,
/obj/item/storage/box/bodybags,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"hYN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -32233,15 +32252,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/fore)
"irX" = (
/obj/machinery/camera/autoname/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/table/reinforced/rglass,
/obj/item/storage/backpack/duffelbag/med/surgery,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"isd" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
dir = 4
@@ -50512,6 +50522,14 @@
/obj/effect/spawner/random/trash/box,
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/starboard/fore)
"nbe" = (
/obj/vehicle/sealed/mecha/ripley/cargo,
/obj/effect/turf_decal/siding/thinplating_new{
dir = 4
},
/obj/effect/turf_decal/bot_red,
/turf/open/floor/iron/textured_large,
/area/station/cargo/warehouse)
"nbi" = (
/obj/effect/turf_decal/trimline/green/warning,
/obj/effect/spawner/random/structure/table_or_rack,
@@ -53692,14 +53710,6 @@
/obj/item/storage/bag/tray/cafeteria,
/turf/open/floor/iron,
/area/station/security/prison)
"nOj" = (
/obj/vehicle/sealed/mecha/working/ripley/cargo,
/obj/effect/turf_decal/siding/thinplating_new{
dir = 4
},
/obj/effect/turf_decal/bot_red,
/turf/open/floor/iron/textured_large,
/area/station/cargo/warehouse)
"nOB" = (
/obj/structure/kitchenspike,
/obj/structure/sign/poster/random/directional/north,
@@ -63060,14 +63070,6 @@
/obj/structure/foamedmetal,
/turf/open/floor/plating,
/area/station/maintenance/floor1/port/aft)
"qpo" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/sign/poster/official/random/directional/north,
/obj/structure/mannequin/skeleton,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"qpp" = (
/obj/machinery/atmospherics/components/binary/valve/digital{
name = "Waste Release"
@@ -85446,6 +85448,14 @@
/obj/effect/turf_decal/tile/dark_red/fourcorners,
/turf/open/floor/iron,
/area/station/security/brig)
"wmN" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/structure/sign/poster/official/random/directional/north,
/obj/structure/mannequin/skeleton,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"wmQ" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -86775,16 +86785,6 @@
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"wDM" = (
/obj/machinery/light/small/directional/north,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/machinery/digital_clock/directional/north,
/obj/item/storage/box/bodybags,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"wDS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -115765,7 +115765,7 @@ bAh
htK
oic
gUS
nOj
nbe
dzo
bUC
yiZ
@@ -197265,7 +197265,7 @@ fou
eAV
hrw
jRO
wDM
hYB
bKs
gCw
slI
@@ -197522,7 +197522,7 @@ dQH
jdx
cnK
jRO
cUK
aeS
rlB
wLV
uMK
@@ -197779,7 +197779,7 @@ jSW
nrX
mkE
gQx
irX
fxc
xWy
pfd
fQH
@@ -198036,7 +198036,7 @@ hbj
cle
bWz
jRO
qpo
wmN
qAh
rAu
lVE
_maps/map_files/VoidRaptor/VoidRaptor.dmm
+48 -48
View File
@@ -21143,6 +21143,21 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
"gjk" = (
/obj/structure/table/reinforced,
/obj/item/storage/medkit/fire{
pixel_x = -2;
pixel_y = 4
},
/obj/item/radio/off{
pixel_x = 6;
pixel_y = 6
},
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 10
},
/turf/open/floor/iron/smooth,
/area/station/engineering/lobby)
"gjl" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/lights/mixed,
@@ -33616,27 +33631,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/break_room)
"jGN" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 6
},
/obj/structure/table/reinforced,
/obj/machinery/microwave{
desc = "Cooks and boils stuff, somehow.";
pixel_x = -2;
pixel_y = 5
},
/obj/machinery/requests_console/directional/south{
department = "Engineering";
name = "Engineering Requests Console";
dir = 4;
pixel_y = 0;
pixel_x = 30
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/effect/mapping_helpers/requests_console/assistance,
/turf/open/floor/iron/smooth,
/area/station/engineering/lobby)
"jGT" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start/hangover,
@@ -49241,6 +49235,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/bridge)
"nWh" = (
/obj/vehicle/sealed/mecha/ripley/cargo,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/smooth_edge,
/area/station/cargo/warehouse)
"nWl" = (
/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -57717,21 +57720,6 @@
"qlN" = (
/turf/closed/wall/r_wall,
/area/station/science/robotics/lab)
"qlQ" = (
/obj/structure/table/reinforced,
/obj/item/storage/medkit/fire{
pixel_x = -2;
pixel_y = 4
},
/obj/item/radio/off{
pixel_x = 6;
pixel_y = 6
},
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 10
},
/turf/open/floor/iron/smooth,
/area/station/engineering/lobby)
"qlS" = (
/obj/machinery/door/airlock/research{
name = "Circuit Testing Lab"
@@ -60736,15 +60724,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"rdM" = (
/obj/vehicle/sealed/mecha/working/ripley/cargo,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
},
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/smooth_edge,
/area/station/cargo/warehouse)
"rdT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -75823,6 +75802,27 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/carpet/green,
/area/station/commons/dorms)
"vlP" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 6
},
/obj/structure/table/reinforced,
/obj/machinery/microwave{
desc = "Cooks and boils stuff, somehow.";
pixel_x = -2;
pixel_y = 5
},
/obj/machinery/requests_console/directional/south{
department = "Engineering";
name = "Engineering Requests Console";
dir = 4;
pixel_y = 0;
pixel_x = 30
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/effect/mapping_helpers/requests_console/assistance,
/turf/open/floor/iron/smooth,
/area/station/engineering/lobby)
"vlS" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o,
/obj/structure/window/reinforced/plasma/spawner/directional/north,
@@ -121421,7 +121421,7 @@ mWr
fdG
mhY
vsS
qlQ
gjk
wlh
xBW
iPJ
@@ -121678,7 +121678,7 @@ aTR
mLJ
kSN
cEE
jGN
vlP
rAU
qvp
xCw
@@ -126539,7 +126539,7 @@ wZs
nXO
hcg
onP
rdM
nWh
vFv
tqu
gmb
_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm
+1 -1
View File
@@ -104,7 +104,7 @@
/area/station/maintenance/starboard/lesser)
"y" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/sealed/mecha/working/ripley,
/obj/vehicle/sealed/mecha/ripley,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
_maps/map_files/tramstation/tramstation.dmm
+152 -152
View File
@@ -1626,6 +1626,20 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"aex" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table/glass,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 6;
pixel_y = 4
},
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 4
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"aey" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
@@ -9044,6 +9058,13 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
"bLq" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"bLr" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -16060,6 +16081,13 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/commons/fitness/recreation/entertainment)
"elu" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
"elB" = (
/obj/effect/turf_decal/bot,
/obj/structure/rack,
@@ -16509,12 +16537,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/security/warden)
"etQ" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
"euC" = (
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
@@ -16866,6 +16888,10 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/crew_quarters/dorms)
"eAH" = (
/obj/machinery/digital_clock,
/turf/closed/wall/r_wall,
/area/station/command/bridge)
"eAN" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
@@ -19733,13 +19759,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
/area/station/commons/dorms)
"fGS" = (
/obj/machinery/modular_computer/preset/id{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/command/heads_quarters/rd)
"fGZ" = (
/obj/structure/table,
/obj/item/razor{
@@ -20085,6 +20104,16 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
"fNS" = (
/obj/structure/table,
/obj/item/radio/intercom/directional/east{
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_x = 0
},
/turf/open/floor/iron/dark/small,
/area/station/commons/vacant_room)
"fNV" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23214,6 +23243,14 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness)
"haN" = (
/obj/vehicle/sealed/mecha/ripley/cargo,
/obj/machinery/requests_console/directional/north{
department = "Cargo Bay";
name = "Cargo Bay Requests Console"
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"haS" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/stripes/corner{
@@ -23850,6 +23887,12 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/wood/large,
/area/station/service/library)
"hnK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark/herringbone,
/area/station/commons/vacant_room)
"hnP" = (
/obj/effect/turf_decal/trimline/dark_green/filled/corner{
dir = 4
@@ -24708,6 +24751,10 @@
/obj/structure/closet/bombcloset/security,
/turf/open/floor/iron/showroomfloor,
/area/station/security/lockers)
"hHi" = (
/obj/machinery/digital_clock,
/turf/closed/wall,
/area/station/medical/treatment_center)
"hHm" = (
/obj/structure/table/optable,
/obj/machinery/newscaster/directional/south,
@@ -29166,16 +29213,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"jpw" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/machinery/conveyor_switch/oneway{
id = "engineeringchute";
name = "Shipment Delivery Chute Activator";
pixel_x = -11
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/engineering/main)
"jpC" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 4
@@ -30594,6 +30631,16 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"jRq" = (
/obj/effect/turf_decal/trimline/yellow/filled/line,
/obj/machinery/conveyor_switch/oneway{
id = "engineeringchute";
name = "Shipment Delivery Chute Activator";
pixel_x = -11
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/engineering/main)
"jRy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -31816,6 +31863,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"knX" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/security/office)
"koj" = (
/obj/machinery/vending/wardrobe/jani_wardrobe,
/obj/structure/extinguisher_cabinet/directional/north,
@@ -31924,14 +31979,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"kqy" = (
/obj/vehicle/sealed/mecha/working/ripley/cargo,
/obj/machinery/requests_console/directional/north{
department = "Cargo Bay";
name = "Cargo Bay Requests Console"
},
/turf/open/floor/iron,
/area/station/cargo/storage)
"kqD" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{
dir = 4
@@ -35223,10 +35270,6 @@
},
/turf/closed/wall/r_wall,
/area/station/science/ordnance/storage)
"lwN" = (
/obj/machinery/digital_clock,
/turf/closed/wall/r_wall,
/area/station/command/bridge)
"lwV" = (
/obj/machinery/camera/emp_proof{
c_tag = "Engineering - Atmospherics Plasma Chamber";
@@ -36295,13 +36338,6 @@
/obj/item/cultivator,
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"lQC" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"lQE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/north,
@@ -38088,6 +38124,12 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat_interior)
"mwP" = (
/obj/machinery/chem_mass_spec,
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"mxf" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 10
@@ -38987,6 +39029,18 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
"mPu" = (
/obj/item/paper{
default_raw_text = "Congradulations, agent 'INSERT NAME HERE'! You have been assigned reconnaissance duty among the orbiting rocks of Indecipheres! As this location was previously scouted as a potential build site for a Nanotrasen outpost, one of our benefactors has taken the oppertunity to pre-emptively construct a listening outpost within the region! You have been tasked with monitoring the potentially active future crew and logging all events onboard. If you are a Nanotrasen official who has stumbled upon this outpost before it could be properly established: Please ignore this entire paper.";
name = "initiation paperwork"
},
/obj/machinery/computer/records/medical/syndie{
dir = 1;
req_access = list("syndicate")
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/commons/vacant_room)
"mPN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
@@ -39213,6 +39267,16 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/solars/starboard/fore)
"mWy" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
"mWK" = (
/obj/structure/chair/stool/directional/south,
/obj/effect/landmark/start/hangover,
@@ -40860,14 +40924,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"nyZ" = (
/obj/machinery/computer/operating,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"nzd" = (
/obj/structure/chair{
dir = 1
@@ -42176,20 +42232,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/lower)
"nXd" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table/glass,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/cup/beaker/large{
pixel_x = 6;
pixel_y = 4
},
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 4
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"nXh" = (
/obj/effect/turf_decal/trimline/neutral/warning{
dir = 1
@@ -44006,6 +44048,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/brig)
"oII" = (
/obj/machinery/modular_computer/preset/id{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/command/heads_quarters/rd)
"oIU" = (
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
@@ -45206,12 +45255,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"piT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark/herringbone,
/area/station/commons/vacant_room)
"piX" = (
/turf/open/floor/engine/n2o,
/area/station/engineering/atmos)
@@ -45514,16 +45557,6 @@
dir = 1
},
/area/station/service/kitchen)
"pnz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
"pnF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/thinplating,
@@ -51817,13 +51850,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/white,
/area/station/science/auxlab/firing_range)
"rAZ" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
"rBb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -53506,10 +53532,6 @@
dir = 4
},
/area/station/service/theater)
"siK" = (
/obj/machinery/digital_clock,
/turf/closed/wall,
/area/station/medical/treatment_center)
"siL" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -54103,6 +54125,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
"ssU" = (
/obj/machinery/computer/operating,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"ssV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -55052,16 +55082,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
"sJp" = (
/obj/structure/table,
/obj/item/radio/intercom/directional/east{
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_x = 0
},
/turf/open/floor/iron/dark/small,
/area/station/commons/vacant_room)
"sJx" = (
/obj/structure/chair{
dir = 1
@@ -56647,6 +56667,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/hallway/primary/tram/left)
"tkz" = (
/obj/machinery/computer/operating{
dir = 1
},
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"tkB" = (
/obj/structure/disposalpipe/junction/flip,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -57101,18 +57129,6 @@
/obj/structure/chair,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"tsR" = (
/obj/item/paper{
default_raw_text = "Congradulations, agent 'INSERT NAME HERE'! You have been assigned reconnaissance duty among the orbiting rocks of Indecipheres! As this location was previously scouted as a potential build site for a Nanotrasen outpost, one of our benefactors has taken the oppertunity to pre-emptively construct a listening outpost within the region! You have been tasked with monitoring the potentially active future crew and logging all events onboard. If you are a Nanotrasen official who has stumbled upon this outpost before it could be properly established: Please ignore this entire paper.";
name = "initiation paperwork"
},
/obj/machinery/computer/records/medical/syndie{
dir = 1;
req_access = list("syndicate")
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/commons/vacant_room)
"tsV" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/shower/directional/east,
@@ -61611,14 +61627,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/commons/vacant_room/office)
"uSU" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron,
/area/station/security/office)
"uSV" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/chem_heater/withbuffer,
@@ -61837,14 +61845,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"uWE" = (
/obj/machinery/computer/operating{
dir = 1
},
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"uWI" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/sign/departments/medbay/alt{
@@ -66935,12 +66935,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/foyer)
"wLB" = (
/obj/machinery/chem_mass_spec,
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"wLP" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -68128,6 +68122,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/dorms)
"xmv" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/light/directional/south,
/obj/machinery/digital_clock/directional/south,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
"xmE" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -76063,7 +76063,7 @@ fTI
agz
agz
agz
piT
hnK
gcp
aaa
aaa
@@ -87765,7 +87765,7 @@ wkk
fZX
jLj
gvI
rAZ
elu
kHT
mIN
ezb
@@ -99401,7 +99401,7 @@ pwX
hJd
aYn
hJd
jpw
jRq
qHs
qHs
qHs
@@ -141599,7 +141599,7 @@ exv
gNy
krT
aBI
sJp
fNS
gcp
aaa
aaa
@@ -141856,7 +141856,7 @@ exv
gNy
ydj
jap
tsR
mPu
gcp
aaa
aaa
@@ -149990,7 +149990,7 @@ kaD
qYj
ceW
oca
lQC
bLq
dDi
mtX
tPE
@@ -155897,7 +155897,7 @@ aQO
aQO
aQO
aQO
lwN
eAH
aQO
aQO
aQO
@@ -157664,7 +157664,7 @@ avn
fAg
oUx
wbH
uSU
knX
jKq
jKq
jKq
@@ -161271,7 +161271,7 @@ oXb
hzV
drh
uMg
etQ
xmv
omm
abM
abM
@@ -164922,9 +164922,9 @@ hgX
xRx
bWU
pVk
uWE
tkz
xRx
nyZ
ssU
bVt
cpl
apC
@@ -165165,7 +165165,7 @@ izU
aGM
izU
jyH
wLB
mwP
eHN
csg
mma
@@ -169048,7 +169048,7 @@ adM
obH
aQk
jYS
nXd
aex
lVC
xiP
jYS
@@ -169303,7 +169303,7 @@ vdX
wGF
isM
gUH
pnz
mWy
jYS
qrR
tMg
@@ -169546,7 +169546,7 @@ iTt
itk
jtr
jtr
siK
hHi
xSZ
xqB
xSZ
@@ -180040,7 +180040,7 @@ nUF
jTQ
mrg
cTU
kqy
haN
pZA
uax
uax
@@ -181120,7 +181120,7 @@ izy
tPu
ldG
pof
fGS
oII
pbH
uvU
umu
code/__DEFINES/mecha.dm
+1
View File
@@ -46,6 +46,7 @@
#define MECHA_SNOWFLAKE_ID_MODE "mode_snowflake"
#define MECHA_SNOWFLAKE_ID_EXTINGUISHER "extinguisher_snowflake"
#define MECHA_SNOWFLAKE_ID_EJECTOR "ejector_snowflake"
#define MECHA_SNOWFLAKE_ID_OREBOX_MANAGER "orebox_manager_snowflake"
#define MECHA_AMMO_INCENDIARY "Incendiary bullet"
#define MECHA_AMMO_BUCKSHOT "Buckshot shell"
code/__DEFINES/traits.dm
+6 -1
View File
@@ -775,6 +775,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
///Trait given to a mob with a ckey currently in a temporary body, allowing people to know someone will re-enter the round later.
#define TRAIT_MIND_TEMPORARILY_GONE "temporarily_gone"
/// Trait given to mechs that can have orebox functionality on movement
#define TRAIT_OREBOX_FUNCTIONAL "orebox_functional"
// common trait sources
#define TRAIT_GENERIC "generic"
#define UNCONSCIOUS_TRAIT "unconscious"
@@ -857,11 +860,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define SWORDPLAY_TRAIT "swordplay"
/// Trait given by being recruited as a nuclear operative
#define NUKE_OP_MINION_TRAIT "nuke-op-minion"
/// Trait given by mech equipment
#define TRAIT_MECH_EQUIPMENT(equipment_type) "mech_equipment_[equipment_type]"
///generic atom traits
/// Trait from [/datum/element/rust]. Its rusty and should be applying a special overlay to denote this.
#define TRAIT_RUSTY "rust_trait"
///stops someone from splashing their reagent_container on an object with this trait
/// Stops someone from splashing their reagent_container on an object with this trait
#define TRAIT_DO_NOT_SPLASH "do_not_splash"
/// Marks an atom when the cleaning of it is first started, so that the cleaning overlay doesn't get removed prematurely
#define TRAIT_CURRENTLY_CLEANING "currently_cleaning"
code/datums/components/armor_plate.dm
+1 -1
View File
@@ -15,7 +15,7 @@
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine))
RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(applyplate))
RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(dropplates))
if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley))
if(istype(parent, /obj/vehicle/sealed/mecha/ripley))
RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_mech_overlays))
if(_maxamount)
code/game/objects/effects/spawners/random/exotic.dm
+1 -1
View File
@@ -87,5 +87,5 @@
icon_state = "ripley"
loot = list(
/obj/structure/mecha_wreckage/ripley = 3,
/obj/vehicle/sealed/mecha/working/ripley/mining = 1,
/obj/vehicle/sealed/mecha/ripley/mining = 1,
)
code/modules/cargo/bounties/mech.dm
+2 -2
View File
@@ -13,12 +13,12 @@
/datum/bounty/item/mech/ripleymk2
name = "APLU MK-II \"Ripley\""
reward = CARGO_CRATE_VALUE * 26
wanted_types = list(/obj/vehicle/sealed/mecha/working/ripley/mk2 = TRUE)
wanted_types = list(/obj/vehicle/sealed/mecha/ripley/mk2 = TRUE)
/datum/bounty/item/mech/clarke
name = "Clarke"
reward = CARGO_CRATE_VALUE * 32
wanted_types = list(/obj/vehicle/sealed/mecha/working/clarke = TRUE)
wanted_types = list(/obj/vehicle/sealed/mecha/clarke = TRUE)
/datum/bounty/item/mech/odysseus
name = "Odysseus"
code/modules/shuttle/shuttle_events/player_controlled.dm
+1 -1
View File
@@ -27,7 +27,7 @@
///BACK FOR REVENGE!!!
/datum/shuttle_event/simple_spawner/player_controlled/alien_queen
name = "ALIEN QUEEN! (Kinda dangerous!)"
spawning_list = list(/mob/living/carbon/alien/adult/royal/queen = 1, /obj/vehicle/sealed/mecha/working/ripley = 1)
spawning_list = list(/mob/living/carbon/alien/adult/royal/queen = 1, /obj/vehicle/sealed/mecha/ripley = 1)
spawning_flags = SHUTTLE_EVENT_HIT_SHUTTLE
event_probability = 0.2
code/modules/vehicles/mecha/_mecha.dm
+6 -1
View File
@@ -131,6 +131,9 @@
///flat equipment for iteration
var/list/flat_equipment
///Handles an internal ore box for mining mechs
var/obj/structure/ore_box/ore_box
///Whether our steps are silent due to no gravity
var/step_silent = FALSE
///Sound played when the mech moves
@@ -218,7 +221,7 @@
if(enclosed)
internal_tank = new (src)
RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , PROC_REF(disconnect_air))
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_stepsound))
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
spark_system = new
@@ -285,6 +288,8 @@
STOP_PROCESSING(SSobj, src)
LAZYCLEARLIST(flat_equipment)
QDEL_NULL(ore_box)
QDEL_NULL(cell)
QDEL_NULL(scanmod)
QDEL_NULL(capacitor)
code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+7 -7
View File
@@ -158,21 +158,21 @@
/obj/item/mecha_parts/mecha_equipment/proc/special_attaching_interaction(attach_right = FALSE, obj/vehicle/sealed/mecha/mech, mob/user, checkonly = FALSE)
return FALSE
/obj/item/mecha_parts/mecha_equipment/proc/attach(obj/vehicle/sealed/mecha/M, attach_right = FALSE)
LAZYADD(M.flat_equipment, src)
/obj/item/mecha_parts/mecha_equipment/proc/attach(obj/vehicle/sealed/mecha/new_mecha, attach_right = FALSE)
LAZYADD(new_mecha.flat_equipment, src)
var/to_equip_slot = equipment_slot
if(equipment_slot == MECHA_WEAPON)
if(attach_right)
to_equip_slot = MECHA_R_ARM
else
to_equip_slot = MECHA_L_ARM
if(islist(M.equip_by_category[to_equip_slot]))
M.equip_by_category[to_equip_slot] += src
if(islist(new_mecha.equip_by_category[to_equip_slot]))
new_mecha.equip_by_category[to_equip_slot] += src
else
M.equip_by_category[to_equip_slot] = src
chassis = M
new_mecha.equip_by_category[to_equip_slot] = src
chassis = new_mecha
SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_ATTACHED)
forceMove(M)
forceMove(new_mecha)
log_message("[src] initialized.", LOG_MECHA)
/**
code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+5 -5
View File
@@ -3,18 +3,18 @@
/obj/item/mecha_parts/mecha_equipment/medical
mech_flags = EXOSUIT_MODULE_MEDICAL
/obj/item/mecha_parts/mecha_equipment/medical/attach(obj/vehicle/sealed/mecha/M)
/obj/item/mecha_parts/mecha_equipment/medical/attach(obj/vehicle/sealed/mecha/new_mecha)
. = ..()
START_PROCESSING(SSobj, src)
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/detach(atom/moveto)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/mecha_parts/mecha_equipment/medical/process()
if(!chassis)
return PROCESS_KILL
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/detach()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/mecha_parts/mecha_equipment/medical/sleeper
name = "mounted sleeper"
desc = "Equipment for medical exosuits. A mounted sleeper that stabilizes patients and can inject reagents in the exosuit's reserves."
code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+10 -8
View File
@@ -108,8 +108,8 @@
/obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores()
if(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.flat_equipment && istype(chassis, /obj/vehicle/sealed/mecha/working/ripley))
var/obj/vehicle/sealed/mecha/working/ripley/R = chassis //we could assume that it's a ripley because it has a clamp, but that's ~unsafe~ and ~bad practice~
if(istype(chassis, /obj/vehicle/sealed/mecha/ripley) && (locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.flat_equipment))
var/obj/vehicle/sealed/mecha/ripley/R = chassis //we could assume that it's a ripley because it has a clamp, but that's ~unsafe~ and ~bad practice~
R.collect_ore()
/obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/living/user)
@@ -167,12 +167,14 @@
if(!loc)
STOP_PROCESSING(SSfastprocess, src)
qdel(src)
if(istype(loc, /obj/vehicle/sealed/mecha/working) && scanning_time <= world.time)
var/obj/vehicle/sealed/mecha/working/mecha = loc
if(!LAZYLEN(mecha.occupants))
return
scanning_time = world.time + equip_cooldown
mineral_scan_pulse(get_turf(src))
if(scanning_time > world.time)
return
if(!chassis || !ismecha(loc))
return
if(!LAZYLEN(chassis.occupants))
return
scanning_time = world.time + equip_cooldown
mineral_scan_pulse(get_turf(src))
#undef DRILL_BASIC
#undef DRILL_HARDENED
code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+7 -12
View File
@@ -161,7 +161,7 @@
//how much the armor of the mech is modified by
var/datum/armor/armor_mod
/obj/item/mecha_parts/mecha_equipment/armor/attach(obj/vehicle/sealed/mecha/M, attach_right)
/obj/item/mecha_parts/mecha_equipment/armor/attach(obj/vehicle/sealed/mecha/new_mecha, attach_right)
. = ..()
chassis.set_armor(chassis.get_armor().add_other_armor(armor_mod))
@@ -213,10 +213,10 @@
chassis?.cut_overlay(droid_overlay)
return ..()
/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/vehicle/sealed/mecha/M, attach_right = FALSE)
/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/vehicle/sealed/mecha/new_mecha, attach_right = FALSE)
. = ..()
droid_overlay = new(src.icon, icon_state = "repair_droid")
M.add_overlay(droid_overlay)
new_mecha.add_overlay(droid_overlay)
/obj/item/mecha_parts/mecha_equipment/repair_droid/detach()
chassis.cut_overlay(droid_overlay)
@@ -385,17 +385,12 @@
return FALSE
return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/attach(obj/vehicle/sealed/mecha/M, attach_right = FALSE)
M.active_thrusters = src //Enable by default
/obj/item/mecha_parts/mecha_equipment/thrusters/attach(obj/vehicle/sealed/mecha/new_mecha, attach_right = FALSE)
new_mecha.active_thrusters = src //Enable by default
return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/detach()
if(chassis?.active_thrusters == src)
chassis.active_thrusters = null
return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/Destroy()
if(chassis?.active_thrusters == src)
/obj/item/mecha_parts/mecha_equipment/thrusters/detach(atom/moveto)
if(chassis.active_thrusters == src)
chassis.active_thrusters = null
return ..()
code/modules/vehicles/mecha/equipment/tools/work_tools.dm
+20 -17
View File
@@ -20,17 +20,20 @@
var/clamp_damage = 30 //SKYRAT EDIT - We've removed instant arm delimbs, so this is a buff to make up for it.
// var/clamp_damage = 20 SKYRAT EDIT - Original line
///Var for the chassis we are attached to, needed to access ripley contents and such
var/obj/vehicle/sealed/mecha/working/ripley/cargo_holder
var/obj/vehicle/sealed/mecha/ripley/cargo_holder
///Audio for using the hydraulic clamp
var/clampsound = 'sound/mecha/hydraulic.ogg'
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/attach(obj/vehicle/sealed/mecha/M)
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/attach(obj/vehicle/sealed/mecha/new_mecha)
. = ..()
cargo_holder = M
if(istype(chassis, /obj/vehicle/sealed/mecha/ripley))
cargo_holder = chassis
ADD_TRAIT(chassis, TRAIT_OREBOX_FUNCTIONAL, TRAIT_MECH_EQUIPMENT(type))
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/detach(atom/moveto = null)
. = ..()
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/detach(atom/moveto)
REMOVE_TRAIT(chassis, TRAIT_OREBOX_FUNCTIONAL, TRAIT_MECH_EQUIPMENT(type))
cargo_holder = null
return ..()
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/action(mob/living/source, atom/target, list/modifiers)
if(!action_checks(target))
@@ -77,8 +80,8 @@
LAZYADD(cargo_holder.cargo, clamptarget)
clamptarget.forceMove(chassis)
clamptarget.set_anchored(FALSE)
if(!cargo_holder.box && istype(clamptarget, /obj/structure/ore_box))
cargo_holder.box = clamptarget
if(!cargo_holder.ore_box && istype(clamptarget, /obj/structure/ore_box))
cargo_holder.ore_box = clamptarget
to_chat(source, "[icon2html(src, source)][span_notice("[target] successfully loaded.")]")
log_message("Loaded [clamptarget]. Cargo compartment capacity: [cargo_holder.cargo_capacity - LAZYLEN(cargo_holder.cargo)]", LOG_MECHA)
@@ -341,26 +344,26 @@
icon_state = "ripleyupgrade"
mech_flags = EXOSUIT_MODULE_RIPLEY
/obj/item/mecha_parts/mecha_equipment/ripleyupgrade/can_attach(obj/vehicle/sealed/mecha/working/ripley/M, attach_right = FALSE, mob/user)
if(M.type != /obj/vehicle/sealed/mecha/working/ripley)
/obj/item/mecha_parts/mecha_equipment/ripleyupgrade/can_attach(obj/vehicle/sealed/mecha/ripley/mecha, attach_right = FALSE, mob/user)
if(mecha.type != /obj/vehicle/sealed/mecha/ripley)
to_chat(user, span_warning("This conversion kit can only be applied to APLU MK-I models."))
return FALSE
if(LAZYLEN(M.cargo))
to_chat(user, span_warning("[M]'s cargo hold must be empty before this conversion kit can be applied."))
if(LAZYLEN(mecha.cargo))
to_chat(user, span_warning("[mecha]'s cargo hold must be empty before this conversion kit can be applied."))
return FALSE
if(!(M.mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE)) //non-removable upgrade, so lets make sure the pilot or owner has their say.
to_chat(user, span_warning("[M] must have maintenance protocols active in order to allow this conversion kit."))
if(!(mecha.mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE)) //non-removable upgrade, so lets make sure the pilot or owner has their say.
to_chat(user, span_warning("[mecha] must have maintenance protocols active in order to allow this conversion kit."))
return FALSE
if(LAZYLEN(M.occupants)) //We're actualy making a new mech and swapping things over, it might get weird if players are involved
to_chat(user, span_warning("[M] must be unoccupied before this conversion kit can be applied."))
if(LAZYLEN(mecha.occupants)) //We're actualy making a new mech and swapping things over, it might get weird if players are involved
to_chat(user, span_warning("[mecha] must be unoccupied before this conversion kit can be applied."))
return FALSE
if(!M.cell) //Turns out things break if the cell is missing
if(!mecha.cell) //Turns out things break if the cell is missing
to_chat(user, span_warning("The conversion process requires a cell installed."))
return FALSE
return TRUE
/obj/item/mecha_parts/mecha_equipment/ripleyupgrade/attach(obj/vehicle/sealed/mecha/markone, attach_right = FALSE)
var/obj/vehicle/sealed/mecha/working/ripley/mk2/marktwo = new (get_turf(markone),1)
var/obj/vehicle/sealed/mecha/ripley/mk2/marktwo = new (get_turf(markone),1)
if(!marktwo)
return
QDEL_NULL(marktwo.cell)
code/modules/vehicles/mecha/mecha_construction_paths.dm
+2 -2
View File
@@ -326,7 +326,7 @@
)
/datum/component/construction/mecha/ripley
result = /obj/vehicle/sealed/mecha/working/ripley
result = /obj/vehicle/sealed/mecha/ripley
base_icon = "ripley"
circuit_control = /obj/item/circuitboard/mecha/ripley/main
@@ -399,7 +399,7 @@
)
/datum/component/construction/mecha/clarke
result = /obj/vehicle/sealed/mecha/working/clarke
result = /obj/vehicle/sealed/mecha/clarke
base_icon = "clarke"
circuit_control = /obj/item/circuitboard/mecha/clarke/main
code/modules/vehicles/mecha/mecha_control_console.dm
+4 -4
View File
@@ -35,8 +35,8 @@
emp_recharging = MT.recharging,
tracker_ref = REF(MT)
)
if(istype(M, /obj/vehicle/sealed/mecha/working/ripley))
var/obj/vehicle/sealed/mecha/working/ripley/RM = M
if(istype(M, /obj/vehicle/sealed/mecha/ripley))
var/obj/vehicle/sealed/mecha/ripley/RM = M
mech_data += list(
cargo_space = round((LAZYLEN(RM.cargo) / RM.cargo_capacity) * 100)
)
@@ -100,8 +100,8 @@
<b>Airtank:</b> [chassis.internal_tank ? "[round(chassis.return_pressure(), 0.01)]" : "Not Equipped"] kPa<br>
<b>Pilot:</b> [english_list(chassis.return_drivers(), nothing_text = "None")]<br>
<b>Location:</b> [get_area_name(chassis, TRUE) || "Unknown"]"}
if(istype(chassis, /obj/vehicle/sealed/mecha/working/ripley))
var/obj/vehicle/sealed/mecha/working/ripley/RM = chassis
if(istype(chassis, /obj/vehicle/sealed/mecha/ripley))
var/obj/vehicle/sealed/mecha/ripley/RM = chassis
answer += "<br><b>Used Cargo Space:</b> [round((LAZYLEN(RM.cargo) / RM.cargo_capacity * 100), 0.01)]%"
return answer
code/modules/vehicles/mecha/mecha_movement.dm
+16 -1
View File
@@ -4,9 +4,24 @@
for(var/mob/living/occupant as anything in occupants)
occupant.setDir(newdir)
///Called when the mech moves
/obj/vehicle/sealed/mecha/proc/on_move()
SIGNAL_HANDLER
collect_ore()
play_stepsound()
///Collects ore when we move, if there is an orebox and it is functional
/obj/vehicle/sealed/mecha/proc/collect_ore()
if(isnull(ore_box) || !HAS_TRAIT(src, TRAIT_OREBOX_FUNCTIONAL))
return
for(var/obj/item/stack/ore/ore in range(1, src))
//we can reach it and it's in front of us? grab it!
if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc))
ore.forceMove(ore_box)
///Plays the mech step sound effect. Split from movement procs so that other mechs (HONK) can override this one specific part.
/obj/vehicle/sealed/mecha/proc/play_stepsound()
SIGNAL_HANDLER
if(mecha_flags & QUIET_STEPS)
return
playsound(src, stepsound, 40, TRUE)
code/modules/vehicles/mecha/working/clarke.dm
+28 -18
View File
@@ -1,5 +1,5 @@
///Lavaproof, fireproof, fast mech with low armor and higher energy consumption, cannot strafe and has an internal ore box.
/obj/vehicle/sealed/mecha/working/clarke
/obj/vehicle/sealed/mecha/clarke
desc = "Combining man and machine for a better, stronger engineer. Can even resist lava!"
name = "\improper Clarke"
icon_state = "clarke"
@@ -10,7 +10,7 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
lights_power = 7
step_energy_drain = 15 //slightly higher energy drain since you movin those wheels FAST
armor_type = /datum/armor/working_clarke
armor_type = /datum/armor/mecha_clarke
equip_by_category = list(
MECHA_L_ARM = null,
MECHA_R_ARM = null,
@@ -28,8 +28,9 @@
enter_delay = 40
mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE | OMNIDIRECTIONAL_ATTACKS
internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING)
allow_diagonal_movement = TRUE
/datum/armor/working_clarke
/datum/armor/mecha_clarke
melee = 20
bullet = 10
laser = 20
@@ -38,15 +39,16 @@
fire = 100
acid = 100
/obj/vehicle/sealed/mecha/working/clarke/Initialize(mapload)
/obj/vehicle/sealed/mecha/clarke/Initialize(mapload)
. = ..()
box = new(src)
ore_box = new(src)
/obj/vehicle/sealed/mecha/working/clarke/Destroy()
INVOKE_ASYNC(box, TYPE_PROC_REF(/obj/structure/ore_box, dump_box_contents))
/obj/vehicle/sealed/mecha/clarke/atom_destruction()
if(ore_box)
INVOKE_ASYNC(ore_box, TYPE_PROC_REF(/obj/structure/ore_box, dump_box_contents))
return ..()
/obj/vehicle/sealed/mecha/working/clarke/generate_actions()
/obj/vehicle/sealed/mecha/clarke/generate_actions()
. = ..()
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_search_ruins)
@@ -60,23 +62,31 @@
icon_state = "bin"
equipment_slot = MECHA_UTILITY
detachable = FALSE
/// Var to avoid istype checking every time the topic button is pressed. This will only work inside Clarke mechs.
var/obj/vehicle/sealed/mecha/working/clarke/hostmech
/obj/item/mecha_parts/mecha_equipment/orebox_manager/attach(obj/vehicle/sealed/mecha/M, attach_right = FALSE)
/obj/item/mecha_parts/mecha_equipment/orebox_manager/attach(obj/vehicle/sealed/mecha/mecha, attach_right = FALSE)
. = ..()
if(istype(M, /obj/vehicle/sealed/mecha/working/clarke))
hostmech = M
ADD_TRAIT(chassis, TRAIT_OREBOX_FUNCTIONAL, TRAIT_MECH_EQUIPMENT(type))
/obj/item/mecha_parts/mecha_equipment/orebox_manager/detach()
hostmech = null //just in case
/obj/item/mecha_parts/mecha_equipment/orebox_manager/detach(atom/moveto)
REMOVE_TRAIT(chassis, TRAIT_OREBOX_FUNCTIONAL, TRAIT_MECH_EQUIPMENT(type))
return ..()
/obj/item/mecha_parts/mecha_equipment/orebox_manager/get_snowflake_data()
var/list/data = list("snowflake_id" = MECHA_SNOWFLAKE_ID_OREBOX_MANAGER)
data["cargo"] = length(chassis.ore_box?.contents)
return data
/obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params)
. = ..()
if(action == "toggle")
hostmech.box?.dump_box_contents()
activated = TRUE
if(.)
return TRUE
if(action == "dump")
var/obj/structure/ore_box/cached_ore_box = chassis.ore_box
if(isnull(cached_ore_box))
return FALSE
cached_ore_box.dump_box_contents()
log_message("Dumped [cached_ore_box].", LOG_MECHA)
return TRUE
#define SEARCH_COOLDOWN (1 MINUTES)
code/modules/vehicles/mecha/working/ripley.dm
+29 -32
View File
@@ -1,4 +1,4 @@
/obj/vehicle/sealed/mecha/working/ripley
/obj/vehicle/sealed/mecha/ripley
desc = "Autonomous Power Loader Unit MK-I. Designed primarily around heavy lifting, the Ripley can be outfitted with utility equipment to fill a number of roles."
name = "\improper APLU MK-I \"Ripley\""
icon_state = "ripley"
@@ -9,7 +9,7 @@
max_integrity = 200
ui_x = 1200
lights_power = 7
armor_type = /datum/armor/working_ripley
armor_type = /datum/armor/mecha_ripley
max_equip_by_category = list(
MECHA_UTILITY = 2,
MECHA_POWER = 1,
@@ -32,6 +32,7 @@
MECHA_POWER = list(),
MECHA_ARMOR = list(),
)
allow_diagonal_movement = TRUE
/// Amount of Goliath hides attached to the mech
var/hides = 0
/// List of all things in Ripley's Cargo Compartment
@@ -43,7 +44,7 @@
/// How fast the mech is in normal pressure
var/slow_pressure_step_in = 2
/datum/armor/working_ripley
/datum/armor/mecha_ripley
melee = 40
bullet = 20
laser = 10
@@ -52,18 +53,18 @@
fire = 100
acid = 100
/obj/vehicle/sealed/mecha/working/ripley/Move()
/obj/vehicle/sealed/mecha/ripley/Move()
. = ..()
update_pressure()
/obj/vehicle/sealed/mecha/working/ripley/generate_actions() //isnt allowed to have internal air
/obj/vehicle/sealed/mecha/ripley/generate_actions() //isnt allowed to have internal air
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_eject)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_lights)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_view_stats)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_safeties)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/strafe)
/obj/vehicle/sealed/mecha/working/ripley/Initialize(mapload)
/obj/vehicle/sealed/mecha/ripley/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate, 3, /obj/item/stack/sheet/animalhide/goliath_hide, /datum/armor/armor_plate_ripley_goliath)
@@ -72,14 +73,14 @@
bullet = 5
laser = 5
/obj/vehicle/sealed/mecha/working/ripley/Destroy()
/obj/vehicle/sealed/mecha/ripley/Destroy()
for(var/atom/movable/A in cargo)
A.forceMove(drop_location())
step_rand(A)
QDEL_LIST(cargo)
return ..()
/obj/vehicle/sealed/mecha/working/ripley/mk2
/obj/vehicle/sealed/mecha/ripley/mk2
desc = "Autonomous Power Loader Unit MK-II. This prototype Ripley is refitted with a pressurized cabin, trading its prior speed for atmospheric protection and armor."
name = "\improper APLU MK-II \"Ripley\""
icon_state = "ripleymkii"
@@ -90,13 +91,13 @@
max_temperature = 30000
max_integrity = 250
possible_int_damage = MECHA_INT_FIRE|MECHA_INT_TEMP_CONTROL|MECHA_INT_TANK_BREACH|MECHA_INT_CONTROL_LOST|MECHA_INT_SHORT_CIRCUIT
armor_type = /datum/armor/ripley_mk2
armor_type = /datum/armor/mecha_ripley_mk2
wreckage = /obj/structure/mecha_wreckage/ripley/mk2
enclosed = TRUE
enter_delay = 40
silicon_icon_state = null
/datum/armor/ripley_mk2
/datum/armor/mecha_ripley_mk2
melee = 40
bullet = 30
laser = 30
@@ -105,7 +106,7 @@
fire = 100
acid = 100
/obj/vehicle/sealed/mecha/working/ripley/mk2/generate_actions()
/obj/vehicle/sealed/mecha/ripley/mk2/generate_actions()
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_eject)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_internals)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_toggle_lights)
@@ -113,7 +114,7 @@
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/mech_view_stats)
initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/strafe)
/obj/vehicle/sealed/mecha/working/ripley/deathripley
/obj/vehicle/sealed/mecha/ripley/deathripley
desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE"
name = "\improper DEATH-RIPLEY"
icon_state = "deathripley"
@@ -135,7 +136,7 @@
MECHA_ARMOR = list(),
)
/obj/vehicle/sealed/mecha/working/ripley/deathripley/real
/obj/vehicle/sealed/mecha/ripley/deathripley/real
desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE. FOR REAL"
equip_by_category = list(
MECHA_L_ARM = /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill,
@@ -145,16 +146,13 @@
MECHA_ARMOR = list(),
)
/obj/vehicle/sealed/mecha/working/ripley/mining
/obj/vehicle/sealed/mecha/ripley/mining
desc = "An old, dusty mining Ripley."
name = "\improper APLU \"Miner\""
/obj/vehicle/sealed/mecha/working/ripley/mining/Initialize(mapload)
. = ..()
take_damage(125) // Low starting health
/obj/vehicle/sealed/mecha/working/ripley/mining/Initialize(mapload)
/obj/vehicle/sealed/mecha/ripley/mining/Initialize(mapload)
. = ..()
take_damage(125)
if(cell)
cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge
if(prob(70)) //Maybe add a drill
@@ -175,16 +173,16 @@
var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
scanner.attach(src)
GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/working/ripley/cargo)
GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo)
/obj/vehicle/sealed/mecha/working/ripley/cargo
/obj/vehicle/sealed/mecha/ripley/cargo
desc = "An ailing, old, repurposed cargo hauler. Most of its equipment wires are frayed or missing and its frame is rusted."
name = "\improper APLU \"Big Bess\""
icon_state = "hauler"
base_icon_state = "hauler"
max_integrity = 100 //Has half the health of a normal RIPLEY mech, so it's harder to use as a weapon.
/obj/vehicle/sealed/mecha/working/ripley/cargo/Initialize(mapload)
/obj/vehicle/sealed/mecha/ripley/cargo/Initialize(mapload)
. = ..()
if(cell)
cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge
@@ -197,18 +195,18 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/working/ripley/cargo)
if(!GLOB.cargo_ripley && mapload)
GLOB.cargo_ripley = src
/obj/vehicle/sealed/mecha/working/ripley/cargo/Destroy()
/obj/vehicle/sealed/mecha/ripley/cargo/Destroy()
if(GLOB.cargo_ripley == src)
GLOB.cargo_ripley = null
return ..()
/obj/vehicle/sealed/mecha/working/ripley/Exit(atom/movable/leaving, direction)
/obj/vehicle/sealed/mecha/ripley/Exit(atom/movable/leaving, direction)
if(leaving in cargo)
return FALSE
return ..()
/obj/vehicle/sealed/mecha/working/ripley/contents_explosion(severity, target)
/obj/vehicle/sealed/mecha/ripley/contents_explosion(severity, target)
for(var/i in cargo)
var/obj/cargoobj = i
if(prob(10 * severity))
@@ -223,7 +221,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/working/ripley/cargo)
/obj/item/mecha_parts/mecha_equipment/ejector/get_snowflake_data()
var/list/data = list("snowflake_id" = MECHA_SNOWFLAKE_ID_EJECTOR, "cargo" = list())
var/obj/vehicle/sealed/mecha/working/ripley/miner = chassis
var/obj/vehicle/sealed/mecha/ripley/miner = chassis
for(var/obj/crate in miner.cargo)
data["cargo"] += list(list(
"name" = crate.name,
@@ -236,20 +234,19 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/working/ripley/cargo)
if(.)
return TRUE
if(action == "eject")
var/obj/vehicle/sealed/mecha/working/ripley/miner = chassis
var/obj/vehicle/sealed/mecha/ripley/miner = chassis
var/obj/crate = locate(params["cargoref"]) in miner.cargo
if(!crate)
return FALSE
to_chat(miner.occupants, "[icon2html(src, miner.occupants)][span_notice("You unload [crate].")]")
crate.forceMove(drop_location())
LAZYREMOVE(miner.cargo, crate)
if(crate == miner.box)
miner.box = null
if(crate == miner.ore_box)
miner.ore_box = null
log_message("Unloaded [crate]. Cargo compartment capacity: [miner.cargo_capacity - LAZYLEN(miner.cargo)]", LOG_MECHA)
return TRUE
/obj/vehicle/sealed/mecha/working/ripley/relay_container_resist_act(mob/living/user, obj/O)
/obj/vehicle/sealed/mecha/ripley/relay_container_resist_act(mob/living/user, obj/O)
to_chat(user, span_notice("You lean on the back of [O] and start pushing so it falls out of [src]."))
if(do_after(user, 300, target = O))
if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src )
@@ -266,7 +263,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/working/ripley/cargo)
*
* Checks for Lavaland pressure, if that works out the mech's speed is equal to fast_pressure_step_in and the cooldown for the mecha drill is halved. If not it uses slow_pressure_step_in and drill cooldown is normal.
*/
/obj/vehicle/sealed/mecha/working/ripley/proc/update_pressure()
/obj/vehicle/sealed/mecha/ripley/proc/update_pressure()
var/turf/T = get_turf(loc)
if(lavaland_equipment_pressure_check(T))
code/modules/vehicles/mecha/working/working.dm
-27
View File
@@ -1,27 +0,0 @@
/obj/vehicle/sealed/mecha/working
allow_diagonal_movement = TRUE
/// Handles an internal ore box for working mechs
var/obj/structure/ore_box/box
/obj/vehicle/sealed/mecha/working/Destroy()
QDEL_NULL(box)
return ..()
/obj/vehicle/sealed/mecha/working/Move()
. = ..()
if(.)
collect_ore()
/**
* Handles collecting ore.
*
* Checks for a hydraulic clamp or ore box manager and if it finds an ore box inside them puts ore in the ore box.
*/
/obj/vehicle/sealed/mecha/working/proc/collect_ore()
if(!box)
return
if(!(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in flat_equipment) && !(locate(/obj/item/mecha_parts/mecha_equipment/orebox_manager) in equip_by_category[MECHA_UTILITY]))
return
for(var/obj/item/stack/ore/ore in range(1, src))
if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc)) //we can reach it and it's in front of us? grab it!
ore.forceMove(box)
tgstation.dme
-1
View File
@@ -5269,7 +5269,6 @@
#include "code\modules\vehicles\mecha\medical\odysseus.dm"
#include "code\modules\vehicles\mecha\working\clarke.dm"
#include "code\modules\vehicles\mecha\working\ripley.dm"
#include "code\modules\vehicles\mecha\working\working.dm"
#include "code\modules\vending\_vending.dm"
#include "code\modules\vending\assist.dm"
#include "code\modules\vending\autodrobe.dm"
tgui/packages/tgui/interfaces/Mecha/UtilityModulesPane.tsx
+25
View File
@@ -69,6 +69,7 @@ export const UtilityModulesPane = (props, context) => {
const MECHA_SNOWFLAKE_ID_EJECTOR = 'ejector_snowflake';
const MECHA_SNOWFLAKE_ID_EXTINGUISHER = 'extinguisher_snowflake';
const MECHA_SNOWFLAKE_ID_OREBOX_MANAGER = 'orebox_manager_snowflake';
// Handles all the snowflake buttons and whatever
const Snowflake = (props: { module: MechaUtility }, context) => {
@@ -78,11 +79,35 @@ const Snowflake = (props: { module: MechaUtility }, context) => {
return <SnowflakeEjector module={props.module} />;
case MECHA_SNOWFLAKE_ID_EXTINGUISHER:
return <SnowflakeExtinguisher module={props.module} />;
case MECHA_SNOWFLAKE_ID_OREBOX_MANAGER:
return <SnowflakeOrebox module={props.module} />;
default:
return null;
}
};
const SnowflakeOrebox = (props: { module: MechaUtility }, context) => {
const { act, data } = useBackend<OperatorData>(context);
const { cargo } = props.module.snowflake;
return (
<Box>
<div className="UtilityModulePane__SnowflakeEjector__entry">
<UtilityName name={'Ore Box'} />
<Button
onClick={() =>
act('equip_act', {
ref: props.module.ref,
gear_action: 'dump',
})
}
disabled={!cargo}>
{cargo ? 'Dump contents' : 'Empty'}
</Button>
</div>
</Box>
);
};
const SnowflakeEjector = (props: { module: MechaUtility }, context) => {
const { act, data } = useBackend<OperatorData>(context);
const { cargo } = props.module.snowflake;
tools/UpdatePaths/Scripts/76296_working_mecha_nuke.txt
+3
View File
@@ -0,0 +1,3 @@
# In this PR, the working mecha subtype was removed.
/obj/vehicle/sealed/mecha/working/@SUBTYPES : /obj/vehicle/sealed/mecha/@SUBTYPES{@OLD}