From f7eadc37050404d65f0924fbdf7d04692b8d900f Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 8 Oct 2020 16:31:09 -0300 Subject: [PATCH 1/9] micro engine changes --- .../StationRuins/Box/Engine/budget.dmm | 16 ------ .../StationRuins/Box/Engine/engine_am.dmm | 50 +++---------------- .../StationRuins/Box/Engine/engine_teg.dmm | 37 +++++++++++--- config/game_options.txt | 2 +- 4 files changed, 37 insertions(+), 68 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm index e241b776..fab27981 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm @@ -49,12 +49,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engine/engineering) -"eP" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "fq" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -64,16 +58,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"gF" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 50 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "ha" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm index 96e28fbc..c9bd6a78 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm @@ -118,20 +118,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"nR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/box/red, -/turf/open/floor/engine, -/area/engine/engineering) -"nW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/box/red, -/turf/open/floor/engine, -/area/engine/engineering) "qH" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -180,13 +166,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"xg" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "xx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -266,13 +245,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"Bh" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "BG" = ( /obj/structure/closet/emcloset/anchored, /obj/machinery/light/small{ @@ -462,10 +434,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"Og" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/engineering) "Ox" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -503,10 +471,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"SD" = ( -/obj/effect/turf_decal/box/red, -/turf/open/floor/engine, -/area/engine/engineering) "Tr" = ( /obj/structure/sign/warning/radiation/rad_area, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -1009,7 +973,7 @@ wt Ch rj rj -Og +rj MJ MJ MJ @@ -1037,7 +1001,7 @@ ZK zZ ZK fH -Og +rj MJ MJ MJ @@ -1065,7 +1029,7 @@ Ox Ox Zb lY -Og +rj MJ MJ MJ @@ -1093,7 +1057,7 @@ ZF ZF Yd lY -Og +rj MJ MJ MJ @@ -1121,7 +1085,7 @@ Mn Mn WQ lY -Og +rj MJ MJ MJ @@ -1149,7 +1113,7 @@ No tT No LV -Og +rj MJ MJ MJ @@ -1177,7 +1141,7 @@ wt Ch rj rj -Og +rj MJ MJ MJ diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm index 42ed0035..aec8b0a0 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm @@ -87,6 +87,15 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel, /area/engine/engineering) +"dq" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/engineering/glass{ + dir = 4; + name = "Supermatter Engine Room"; + req_access_txt = "10" + }, +/turf/open/floor/engine/vacuum, +/area/engine/engineering) "ds" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/delivery, @@ -322,7 +331,6 @@ /turf/open/space, /area/space/nearstation) "kK" = ( -/obj/machinery/vending/cola/random, /obj/structure/extinguisher_cabinet{ pixel_x = 26; pixel_y = 32 @@ -462,9 +470,7 @@ /area/engine/engineering) "oQ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, +/mob/living/carbon/monkey, /turf/open/floor/engine/vacuum, /area/engine/engineering) "oS" = ( @@ -1045,6 +1051,10 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"Et" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/plasteel, +/area/engine/engineering) "EH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 @@ -1126,6 +1136,10 @@ /area/engine/engineering) "Go" = ( /obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{ + pixel_x = 6; + pixel_y = 6 + }, /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, /turf/open/floor/plasteel, /area/engine/engineering) @@ -1234,6 +1248,9 @@ /area/engine/engineering) "Jj" = ( /obj/machinery/vending/snack/random, +/obj/structure/sign/warning/securearea{ + pixel_x = 29 + }, /turf/open/floor/plasteel, /area/engine/engineering) "Js" = ( @@ -1461,6 +1478,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -1; + pixel_y = 34 + }, /turf/open/floor/plasteel, /area/engine/engineering) "PK" = ( @@ -1624,7 +1645,7 @@ /turf/open/floor/plating, /area/engine/engineering) "TE" = ( -/obj/structure/closet/crate/internals, +/obj/machinery/vending/cola/random, /turf/open/floor/plasteel, /area/engine/engineering) "TH" = ( @@ -2367,7 +2388,7 @@ EL EL pY BI -Ok +Et Ok TE MP @@ -2506,7 +2527,7 @@ OK PK en MP -MP +dq MP MP MP @@ -2533,10 +2554,10 @@ ZY QH Hp Kx -kS oQ kS kS +kS qv ek Le diff --git a/config/game_options.txt b/config/game_options.txt index c97a0bfe..b7b0adf1 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -574,7 +574,7 @@ BOX_RANDOM_ENGINE Box Singulo,3 BOX_RANDOM_ENGINE Box SM 1x3,1 BOX_RANDOM_ENGINE Box SM 5x5,1 BOX_RANDOM_ENGINE Box SM 3x,1 -BOX_RANDOM_ENGINE Box TEG,2 +BOX_RANDOM_ENGINE Box TEG,1 BOX_RANDOM_ENGINE Box Empty,0 BOX_RANDOM_ENGINE Box Antimatter,1 BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0 \ No newline at end of file From c0e6f2807720867a37d34d3a3e1d2ff9519477df Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 8 Oct 2020 16:37:43 -0300 Subject: [PATCH 2/9] found the issue --- code/datums/ruins/station.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/ruins/station.dm b/code/datums/ruins/station.dm index 32b741e5..9316a4b0 100644 --- a/code/datums/ruins/station.dm +++ b/code/datums/ruins/station.dm @@ -37,20 +37,20 @@ /datum/map_template/ruin/station/box/engine/teg id = "engine_teg" - suffix = "Box/Engine/engine_tesla.dmm" + suffix = "Box/Engine/engine_teg.dmm" name = "Box TEG" /datum/map_template/ruin/station/box/engine/empty id = "engine_empty" - suffix = "Box/Engine/engine_tesla.dmm" + suffix = "Box/Engine/empty.dmm" name = "Box Empty" /datum/map_template/ruin/station/box/engine/am id = "engine_am" - suffix = "Box/Engine/engine_tesla.dmm" + suffix = "Box/Engine/engine_am.dmm" name = "Box Antimatter" /datum/map_template/ruin/station/box/engine/budget id = "engine_budget" - suffix = "Box/Engine/engine_tesla.dmm" + suffix = "Box/Engine/budget.dmm" name = "Box P.A.C.M.A.N" From 67c03f52a88f986a3c93d61e93438a95aea9bc25 Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 8 Oct 2020 16:49:31 -0300 Subject: [PATCH 3/9] monke --- _maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm index aec8b0a0..58542177 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm @@ -471,6 +471,7 @@ "oQ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /mob/living/carbon/monkey, +/obj/item/clothing/head/hardhat, /turf/open/floor/engine/vacuum, /area/engine/engineering) "oS" = ( @@ -1938,6 +1939,7 @@ /area/engine/engineering) "ZC" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/item/wrench, /turf/open/floor/engine/vacuum, /area/engine/engineering) "ZT" = ( From df19be334ec9f20eb9568111da9f41e046c197fc Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 8 Oct 2020 23:25:33 -0300 Subject: [PATCH 4/9] more fixes --- .../SpaceRuins/listeningstation.dmm | 44 +++++++++---------- .../StationRuins/Box/Engine/engine_sm_1x3.dmm | 5 +-- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index a2c75cb8..40ec7a15 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -320,6 +320,7 @@ /area/ruin/space/has_grav/listeningstation) "az" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/autolathe/hacked, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "aA" = ( @@ -367,13 +368,6 @@ /obj/item/shovel, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) -"aD" = ( -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, -/turf/closed/wall, -/area/ruin/space/has_grav/listeningstation) "aE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -868,7 +862,7 @@ /area/ruin/space/has_grav/listeningstation) "bn" = ( /obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation) "bo" = ( /obj/machinery/door/firedoor, @@ -1158,6 +1152,10 @@ "fJ" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "hJ" = ( @@ -1180,11 +1178,12 @@ /area/ruin/space/has_grav/listeningstation) "ki" = ( /obj/item/storage/daki{ + desc = "Make us whole.~"; icon_state = "daki_Nar'Sie"; name = "Nar-nar" }, /obj/item/toy/plush/narplush, -/turf/open/floor/plasteel/cult, +/turf/closed/mineral/random, /area/ruin/unpowered/no_grav) "lZ" = ( /obj/structure/cable, @@ -1226,11 +1225,6 @@ "uB" = ( /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) -"xe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/autolathe/hacked, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/listeningstation) "za" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4; @@ -1257,6 +1251,10 @@ pixel_x = 9; pixel_y = 11 }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/listeningstation) "Bd" = ( @@ -1917,14 +1915,14 @@ ab ab ab ab -ab ac ac ac ac ac ac -ab +ac +ac ab ab ab @@ -2123,7 +2121,7 @@ ac aH aN aZ -aD +ac ac ac ac @@ -2239,7 +2237,7 @@ ac ac ah as -xe +ac ac aR ac @@ -2249,7 +2247,7 @@ bx bD ag ag -ab +ag ab ab ab @@ -2395,7 +2393,7 @@ ab ab ab ab -ag +ac ac ac ac @@ -2449,7 +2447,7 @@ bA ag ag ag -ab +ag ab ab ab @@ -2561,12 +2559,12 @@ ao ag aF ag -ac ag ag ag ag -ab +ag +ag ab ab ab diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm index 05e6e4b6..08f2157b 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm @@ -1806,9 +1806,8 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "Vz" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm" }, /turf/open/floor/engine, /area/engine/supermatter) From 4cc6f25612da241acefda6d6c3fb96fd9666a190 Mon Sep 17 00:00:00 2001 From: Dip Date: Fri, 9 Oct 2020 05:59:38 -0300 Subject: [PATCH 5/9] add cable coil and welder --- _maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm index 2c06f622..bec557ea 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm @@ -38,7 +38,8 @@ "M" = (/obj/structure/girder,/turf/open/floor/plating{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered) "N" = (/obj/effect/spawner/structure/window/shuttle,/turf/open/floor/plating{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered) "O" = (/obj/machinery/door/airlock/titanium{name = "Escape Pod Airlock"},/turf/open/floor/mineral/titanium/blue,/area/ruin/powered) -"Q" = (/turf/open/floor/mineral/titanium/blue,/area/ruin/powered) +"Q" = (/obj/item/weldingtool,/turf/open/floor/mineral/titanium/blue,/area/ruin/powered) +"R" = (/obj/item/stack/cable_coil/red,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered) "T" = (/obj/item/stock_parts/matter_bin,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered) "U" = (/obj/item/stock_parts/matter_bin,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "V" = (/turf/closed/wall/mineral/titanium/interior,/area/ruin/powered) @@ -53,7 +54,7 @@ aaacdffgeGhkcaaa aacffffgijmkcaaa aacJfYffLilkcaaa aaccfffffgncaaaa -aaacffZfffpcaaaa +aaacffZfRfpcaaaa aaacTfoqofrcaaaa saactttooucaaaaa saaatvwooKcaaaaa From 7f6d0af6970d2edf1cdc47fbe64a08808765ef52 Mon Sep 17 00:00:00 2001 From: Dip Date: Fri, 9 Oct 2020 15:14:34 -0300 Subject: [PATCH 6/9] more fixes --- .../SpaceRuins/listeningstation.dmm | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 40ec7a15..3e6fc530 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -93,17 +93,17 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "ak" = ( -/obj/structure/filingcabinet, -/obj/item/paper/fluff/ruins/listeningstation/reports/april, -/obj/item/paper/fluff/ruins/listeningstation/reports/may, -/obj/item/paper/fluff/ruins/listeningstation/reports/june, -/obj/item/paper/fluff/ruins/listeningstation/reports/july, -/obj/item/paper/fluff/ruins/listeningstation/reports/august, -/obj/item/paper/fluff/ruins/listeningstation/reports/september, -/obj/item/paper/fluff/ruins/listeningstation/reports/october, -/obj/item/paper/fluff/ruins/listeningstation/receipt, +/obj/structure/rack{ + dir = 8 + }, +/obj/item/stack/sheet/metal/fifty, +/obj/item/integrated_circuit_printer/upgraded, +/obj/item/multitool, /obj/effect/decal/cleanable/dirt, -/obj/item/paper/fluff/ruins/listeningstation/odd_report, +/obj/item/stock_parts/cell/high/plus{ + pixel_x = 9; + pixel_y = -3 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "al" = ( @@ -113,6 +113,10 @@ pixel_y = -12 }, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/meson/night{ + pixel_x = 1; + pixel_y = 11 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "am" = ( @@ -343,17 +347,17 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "aB" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/integrated_circuit_printer/upgraded, -/obj/item/multitool, +/obj/structure/filingcabinet, +/obj/item/paper/fluff/ruins/listeningstation/reports/april, +/obj/item/paper/fluff/ruins/listeningstation/reports/may, +/obj/item/paper/fluff/ruins/listeningstation/reports/june, +/obj/item/paper/fluff/ruins/listeningstation/reports/july, +/obj/item/paper/fluff/ruins/listeningstation/reports/august, +/obj/item/paper/fluff/ruins/listeningstation/reports/september, +/obj/item/paper/fluff/ruins/listeningstation/reports/october, +/obj/item/paper/fluff/ruins/listeningstation/receipt, /obj/effect/decal/cleanable/dirt, -/obj/item/stock_parts/cell/high/plus{ - pixel_x = 9; - pixel_y = -3 - }, +/obj/item/paper/fluff/ruins/listeningstation/odd_report, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "aC" = ( @@ -362,10 +366,10 @@ layer = 2.9 }, /obj/item/storage/bag/ore, -/obj/item/mining_scanner, -/obj/item/pickaxe, /obj/effect/decal/cleanable/dirt, /obj/item/shovel, +/obj/item/pickaxe/mini, +/obj/item/t_scanner/adv_mining_scanner/lesser, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "aE" = ( @@ -2644,7 +2648,7 @@ aa aa aa aa -aa +ab ab ab ab From 244c8bf534f9409e4ba11a0bd3cc73616d8adbb6 Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 10 Oct 2020 02:05:18 -0300 Subject: [PATCH 7/9] oldst --- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index e820b06f..e4062428 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -48,9 +48,12 @@ /obj/item/stack/sheet/mineral/gold{ amount = 25 }, -/obj/item/stack/ore/bluespace_crystal, -/obj/item/stack/ore/bluespace_crystal, -/obj/item/stack/ore/bluespace_crystal, +/obj/item/stack/ore/bluespace_crystal{ + amount = 4 + }, +/obj/item/stack/sheet/mineral/diamond{ + amount = 2 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/ancientstation/hivebot) "ak" = ( @@ -149,8 +152,8 @@ /area/ruin/space/has_grav/ancientstation/hivebot) "aF" = ( /obj/structure/shuttle/engine/large{ - icon_state = "large_engine"; - dir = 4 + dir = 4; + icon_state = "large_engine" }, /turf/closed/wall, /area/ruin/space/has_grav/ancientstation/hivebot) @@ -5139,6 +5142,14 @@ pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, +/obj/item/bluespace_thread{ + pixel_x = -3; + pixel_y = -8 + }, +/obj/item/bluespace_thread{ + pixel_x = 1; + pixel_y = 7 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation) "ZY" = ( From 420f42a4a6418e493b84367405e0eea81f2c2335 Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 10 Oct 2020 05:07:13 -0300 Subject: [PATCH 8/9] more snowdin fixes --- _maps/RandomZLevels/snowdin.dmm | 77 +++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 21c72fa5..b9d2053a 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -817,10 +817,18 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/kitchen) "ci" = ( -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/awaymission/snowdin/post/engineering) "cj" = ( /obj/structure/table, /obj/machinery/microwave, @@ -1947,6 +1955,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/microwave, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "ev" = ( @@ -3615,7 +3624,7 @@ /area/awaymission/snowdin/post/garage) "if" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + req_access_txt = "201" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) @@ -5656,6 +5665,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/post/custodials) "ma" = ( @@ -7427,7 +7437,16 @@ /area/awaymission/snowdin/post/engineering) "pW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/visible{ - dir = 1 + color = "#822bff"; + dir = 4; + pipe_color = "#822bff" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) @@ -7629,13 +7648,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) -"qv" = ( -/obj/machinery/atmospherics/components/binary/volume_pump{ - name = "Air Mix To Turbine Mix" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/awaymission/snowdin/post/engineering) "qw" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 5 @@ -7845,8 +7857,7 @@ idSelf = "snowdin_turbine_access"; name = "Turbine Access Console"; pixel_x = -8; - pixel_y = -26; - req_access_txt = "32" + pixel_y = -26 }, /obj/machinery/button/ignition{ id = "snowdin_turbine_ignitor"; @@ -7877,9 +7888,6 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) "qW" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -7887,6 +7895,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ + dir = 4; + name = "turbine mixer"; + node1_concentration = 0.5; + node2_concentration = 0.5 + }, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) "qX" = ( @@ -7900,6 +7914,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 8 + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -8059,8 +8076,7 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_exterior"; - name = "Turbine Exterior Airlock"; - req_access_txt = "32" + name = "Turbine Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/engine, @@ -8177,6 +8193,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "rH" = ( +/obj/machinery/poweredfans, /obj/machinery/door/airlock/external/glass, /obj/structure/barricade/wooden/crude/snow, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -8185,11 +8202,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post) "rI" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - dir = 1; - id = "syndie_lavaland_inc_in"; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ + dir = 1 }, /obj/effect/light_emitter{ name = "cave light"; @@ -8383,8 +8397,7 @@ frequency = 1449; heat_proof = 1; id_tag = "snowdin_turbine_interior"; - name = "Turbine Interior Airlock"; - req_access_txt = "32" + name = "Turbine Interior Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -29848,8 +29861,8 @@ nN nN nN nN -pW -qv +pV +oP qW rs rM @@ -30364,7 +30377,7 @@ iJ nt pY pV -qY +ci nN nN nN @@ -30597,7 +30610,7 @@ af af af bf -ci +ch cO du dT @@ -30621,7 +30634,7 @@ oS nt pZ qx -qZ +pW ru rO sj From 2381dd750436f6f0d50b053654f4ec460ab610f2 Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 10 Oct 2020 17:42:10 -0300 Subject: [PATCH 9/9] belt + typo fix --- _maps/RandomZLevels/snowdin.dmm | 2 ++ code/modules/mob/living/simple_animal/friendly/dog.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b9d2053a..000a15db 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -6072,6 +6072,7 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/garage) "mX" = ( @@ -7269,6 +7270,7 @@ }, /obj/item/clothing/gloves/color/yellow, /obj/item/stack/cable_coil, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/awaymission/snowdin/post/engineering) "pz" = ( diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index bf7eb05f..79501ff1 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -20,7 +20,7 @@ /mob/living/simple_animal/pet/dog/ComponentInitialize() . = ..() - AddElement(/datum/element/wuv, "yaps_happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE) + AddElement(/datum/element/wuv, "yaps happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE) AddElement(/datum/element/mob_holder, held_icon) //Corgis and pugs are now under one dog subtype