cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-16 02:17:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from ArchieBeepBoop/enginemapfixes

Browse Source 
Some map fixes + changes
This commit is contained in:
QuoteFox
2020-10-12 15:35:06 +01:00
committed by GitHub
parent 4b28162d04 2381dd7504
commit 92d1fbaf1f
11 changed files with 160 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm
+3 -2
View File
@@ -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
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+48 -46
View File
@@ -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" = (
@@ -320,6 +324,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" = (
@@ -342,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" = (
@@ -361,19 +366,12 @@
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)
"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 +866,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 +1156,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 +1182,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 +1229,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 +1255,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 +1919,14 @@ ab
ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ab
ac
ac
ab
ab
ab
@@ -2123,7 +2125,7 @@ ac
aH
aN
aZ
aD
ac
ac
ac
ac
@@ -2239,7 +2241,7 @@ ac
ac
ah
as
xe
ac
ac
aR
ac
@@ -2249,7 +2251,7 @@ bx
bD
ag
ag
ab
ag
ab
ab
ab
@@ -2395,7 +2397,7 @@ ab
ab
ab
ab
ag
ac
ac
ac
ac
@@ -2449,7 +2451,7 @@ bA
ag
ag
ag
ab
ag
ab
ab
ab
@@ -2561,12 +2563,12 @@ ao
ag
aF
ag
ac
ag
ag
ag
ag
ab
ag
ag
ab
ab
ab
@@ -2646,7 +2648,7 @@ aa
aa
aa
aa
aa
ab
ab
ab
ab
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+16 -5
View File
@@ -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" = (
_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm
-16
View File
@@ -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
_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm
+7 -43
View File
@@ -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
_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm
+2 -3
View File
@@ -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)
_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm
+31 -8
View File
@@ -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,8 @@
/area/engine/engineering)
"oQ" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/obj/structure/sign/warning/securearea{
pixel_x = -32
},
/mob/living/carbon/monkey,
/obj/item/clothing/head/hardhat,
/turf/open/floor/engine/vacuum,
/area/engine/engineering)
"oS" = (
@@ -1045,6 +1052,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 +1137,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 +1249,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 +1479,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 +1646,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" = (
@@ -1917,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" = (
@@ -2367,7 +2390,7 @@ EL
EL
pY
BI
Ok
Et
Ok
TE
MP
@@ -2506,7 +2529,7 @@ OK
PK
en
MP
MP
dq
MP
MP
MP
@@ -2533,10 +2556,10 @@ ZY
QH
Hp
Kx
kS
oQ
kS
kS
kS
qv
ek
Le
_maps/RandomZLevels/snowdin.dmm
+47 -32
View File
@@ -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" = (
@@ -6062,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" = (
@@ -7259,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" = (
@@ -7427,7 +7439,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 +7650,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 +7859,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 +7890,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 +7897,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 +7916,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 +8078,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 +8195,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 +8204,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 +8399,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 +29863,8 @@ nN
nN
nN
nN
pW
qv
pV
oP
qW
rs
rM
@@ -30364,7 +30379,7 @@ iJ
nt
pY
pV
qY
ci
nN
nN
nN
@@ -30597,7 +30612,7 @@ af
af
af
bf
ci
ch
cO
du
dT
@@ -30621,7 +30636,7 @@ oS
nt
pZ
qx
qZ
pW
ru
rO
sj
code/datums/ruins/station.dm
+4 -4
View File
@@ -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"
code/modules/mob/living/simple_animal/friendly/dog.dm
+1 -1
View File
@@ -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
config/game_options.txt
+1 -1
View File
@@ -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