Miscelanious map tweaks

This commit is contained in:
Casey
2022-02-26 12:39:39 -05:00
committed by CHOMPStation2
parent 5595f511c6
commit 2916cd9f91
22 changed files with 971 additions and 87 deletions

View File

@@ -489,6 +489,13 @@
/obj/structure/simple_door/sandstone,
/turf/simulated/floor/tiled/asteroid_steel,
/area/tether_away/beach/resort/janibar)
"gq" = (
/obj/move_trader_landmark{
dir = 8;
trader_type = /obj/trader/general
},
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/cavebase)
"gw" = (
/obj/structure/bonfire,
/turf/simulated/mineral/floor/cave{
@@ -1228,6 +1235,10 @@
/obj/machinery/light/small{
dir = 8
},
/obj/move_trader_landmark{
dir = 4;
trader_type = /obj/trader/general
},
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/resort/janibar)
"yF" = (
@@ -1349,6 +1360,14 @@
/obj/item/weapon/stool/baystool/padded,
/turf/simulated/floor/lino,
/area/tether_away/beach/resort/kitchen)
"BC" = (
/obj/structure/table/bench/sifwooden/padded,
/obj/move_trader_landmark{
dir = 4;
trader_type = /obj/trader/general
},
/turf/simulated/floor/wood,
/area/tether_away/beach/resort/kitchen)
"BF" = (
/turf/simulated/wall/sandstone,
/area/tether_away/beach/resort/dorm3)
@@ -1489,6 +1508,20 @@
/obj/machinery/vending/loadout/costume,
/turf/simulated/floor/tiled/asteroid_steel,
/area/tether_away/beach/resort/lockermed)
<<<<<<< HEAD
=======
"EU" = (
/obj/structure/flora/ausbushes/ywflowers,
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/resort)
"Ff" = (
/obj/move_trader_landmark{
dir = 4;
trader_type = /obj/trader/general
},
/turf/simulated/floor/beach/sand/outdoors,
/area/tether_away/beach/resort)
>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
"Fm" = (
/obj/structure/cable{
d1 = 4;
@@ -5409,7 +5442,7 @@ Xd
Xd
Xd
Xd
LQ
gq
Xd
Xd
xy
@@ -10557,7 +10590,7 @@ zV
yf
as
ad
as
BC
yf
as
ad
@@ -15486,7 +15519,7 @@ lI
lI
Nv
Fm
Nv
Ff
lI
pP
lI