Miscelanious map tweaks

code/modules/economy/trader.dm

@@ -0,0 +1,379 @@
+/obj/trader
+	name = "trader"
+	desc = "Some kind of trade thing."
+	icon = 'icons/obj/vending.dmi'
+	icon_state = "generic"
+	anchored = TRUE
+	density = TRUE
+	unacidable = TRUE
+	var/accepts = "coin"				// "coin" - "money" - "item" - determines the 'kind' of thing the machine will accept
+	var/accepted_itemtype				//only for use with "item" mode - if set to a type path, it will count anything with that type path
+	var/accepted_item_worth = 1			//only for use with "item" mode - when counted, things of the appropriate type will add this much to the banked funds
+	var/list/bank = list()					//Anything accepted by "money" or "item" mode will be marked down here
+	var/coinbalance = 0					//only for use with coin mode - when you put a curious coin in, it adds the coins value to this number
+	var/list/start_products = list()	//Type paths entered here will spawn inside the trader and add themselves to the products list.
+	var/list/products = list()			//Anything in this list will be listed for sale
+	var/list/prices = list()			//Enter a type path with an associated number, and if the trader tries to sell something of that type, it will expect the number as the cost for that product
+	var/list/multiple = list()			//Enter a type path with an associated number, and the trader will have however many of that type to sell as the number you entered
+	var/trading = FALSE					//'Busy' - Only one person can trade at a time.	
+	var/welcome_msg = "This machine accepts"	//The first part of the welcome message
+	var/welcome_accepts_name = "curious coins"	//The name of the kind of thing the trader expects, automatically set except on "item" mode, where if you enter a value it will not change it.
+	var/welcome_msg_finish = ". Would you like to browse the wares?"	//The final part of the welcome message.
+	var/list/interact_sound = list()	//The sounds that may play when you click it. It will pick one at random from this list. It only thinks about this if there's anything in the list.
+	var/sound_cooldown = 0				//The sound can only play this often in deciseconds. Use '10 SECONDS' format to make it easier to read
+	var/sound_lastplayed = 0			//Automatically set when the sound is played.
+	var/pick_inventory = FALSE			//If true, when initialized the trader will randomly pick things from its start products list to set up
+	var/pick_inventory_quantity = 0		//This is how many things will be picked if pick_inventory is TRUE
+	var/move_trader = FALSE
+
+/obj/trader/Initialize(mapload)
+	. = ..()
+	if(pick_inventory)
+		while(pick_inventory_quantity > 0)
+			var/t = pickweight(start_products)
+			var/i = new t(src)
+			start_products -= t
+			products += i
+			pick_inventory_quantity --
+	else
+		for(var/item in start_products)
+			var/obj/p = new item(src)
+			products += p
+			start_products -= item
+	if(move_trader)
+		move_trader()
+
+/obj/trader/Destroy()
+	. = ..()
+	LAZYCLEARLIST(products)
+	LAZYCLEARLIST(bank)
+	LAZYCLEARLIST(start_products)
+	LAZYCLEARLIST(prices)
+	LAZYCLEARLIST(multiple)
+	for(var/item in contents)
+		qdel(item)
+
+/obj/trader/attack_hand(mob/living/user)
+	. = ..()
+	if(trading)
+		to_chat(user, "<span class='notice'>\The [src] is busy with someone else at the moment...</span>")
+		return
+	var/coin_value = get_value(accepts)
+	if(products.len > 0)
+		trading = TRUE
+		switch(accepts)
+			if("coin")
+				welcome_accepts_name = "curious coins"
+			if("money")
+				welcome_accepts_name = "Thalers"
+			if("item")
+				if(welcome_accepts_name == "curious coins")
+					welcome_accepts_name = "a kind of item"
+		var/ask = tgui_alert(user, "[welcome_msg][welcome_accepts_name][welcome_msg_finish]", "[src]",list("Yes","No","Return banked funds"), timeout = 10 SECONDS)
+		if (ask == "Return banked funds")
+			if(!Adjacent(user))
+				to_chat(user, "<span class='notice'>You aren't close enough.</span>")
+				trading = FALSE
+				return
+			return_funds()
+			trading = FALSE
+			return
+		else if(ask != "Yes")
+			trading = FALSE
+			return
+		if(!Adjacent(user))
+			to_chat(user, "<span class='notice'>You decided not to get anything.</span>")
+			trading = FALSE
+			return
+		if(interact_sound.len > 0)
+			if((world.time- sound_lastplayed) > sound_cooldown)
+				var/sound = pick(interact_sound)
+				playsound(src, sound, 25, FALSE, ignore_walls = FALSE)
+				sound_lastplayed = world.time
+		var/obj/input = tgui_input_list(user, "What would you like? You have [coin_value] banked with this trader.", "Trader", products, timeout = 30 SECONDS)
+		if(!input || !Adjacent(user))
+			to_chat(user, "<span class='notice'>You decided not to get anything.</span>")
+			trading = FALSE
+			return
+		var/p = 0
+		var/t = input.type
+		if(t in prices)
+			p = prices[t]
+		if(p > 0)
+			if(tgui_alert(user, "Are you sure? This costs [p].", "Confirm",list("Yes","No")) != "Yes")
+				to_chat(user, "<span class='notice'>You decided not to.</span>")
+				trading = FALSE
+				return
+			else if (coin_value < p)
+				to_chat(user, "<span class='warning'>You haven't provided enough funds!</span>")
+				trading = FALSE
+				return
+		if(!Adjacent(user))
+			to_chat(user, "<span class='notice'>You decided not to get anything.</span>")
+			trading = FALSE
+			return
+		if(t in multiple)
+			multiple[t] -= 1
+			var/temp = input
+			input = new t(get_turf(user))
+			if(multiple[t] <= 0)
+				for(var/obj/d in products)
+					if(istype(d, temp))
+						d.forceMove(get_turf(loc))
+						qdel(d)
+		input.forceMove(get_turf(user))
+		user.put_in_hands(input)
+		products -= input
+		deduct_value(p)
+		if(tgui_alert(user, "Would you like your change back, or would you like it to remain banked for later use? (Anyone can use banked funds)", "[src]",list("Keep it banked","I want my change"), timeout = 10 SECONDS) == "I want my change")
+			if(!Adjacent(user))
+				to_chat(user, "<span class='notice'>You aren't close enough.</span>")
+				trading = FALSE
+				return
+			return_funds()
+		else
+			to_chat(user, "<span class='notice'>You decided leave your change banked.</span>")
+		trading = FALSE
+	else
+		to_chat(user, "<span class='notice'>\The [src] hasn't got anything to sell.</span>")
+		return
+
+/obj/trader/attackby(obj/item/O, mob/user)
+	. = ..()
+	switch(accepts)
+		if("coin")
+			if(istype(O, /obj/item/weapon/aliencoin))
+				var/obj/item/weapon/aliencoin/a = O
+				coinbalance += a.value
+				visible_message("<span class='notice'>\The [src] accepts \the [user]'s [O].</span>")
+				qdel(a)
+		if("money")
+			if(istype(O, /obj/item/weapon/spacecash))
+				var/obj/item/weapon/spacecash/w = O
+				for(var/obj/item/weapon/spacecash/c in bank)
+					var/loadsamoney = w.worth
+					qdel(w)
+					c.worth += loadsamoney
+					c.update_icon()
+					loadsamoney = null
+					visible_message("<span class='notice'>\The [src] accepts \the [user]'s [O].</span>")
+					return
+				user.drop_item()
+				w.forceMove(src.contents)
+				bank += w
+				visible_message("<span class='notice'>\The [src] accepts \the [user]'s [w].</span>")
+		if("item")
+			if(istype(O, /obj))
+				user.drop_item()
+				O.forceMove(src.contents)
+				bank += O
+				visible_message("<span class='notice'>\The [src] accepts \the [user]'s [O].</span>")
+
+/obj/trader/proc/get_value(kind)
+	var/value = 0
+	switch(kind)
+		if("coin")
+			value = coinbalance
+		if("money")
+			for(var/obj/c in bank)
+				if(istype(c, /obj/item/weapon/spacecash))
+					var/obj/item/weapon/spacecash/a = c
+					value += a.worth
+				else
+					c.forceMove(get_turf(src))
+					visible_message("<span class='warning'>\The [src] drops the worthless [c]...</span>")
+		if("item")
+			for(var/obj/c in bank)
+				if(istype(c, accepted_itemtype))
+					value += accepted_item_worth
+				else
+					c.forceMove(get_turf(src))
+					visible_message("<span class='warning'>\The [src] drops the worthless [c]...</span>")
+	return value
+
+/obj/trader/proc/deduct_value(amount)
+	switch(accepts)
+		if("coin")
+			coinbalance -= amount
+		if("money")
+			for(var/obj/c in bank)
+				if(istype(c, /obj/item/weapon/spacecash))
+					var/obj/item/weapon/spacecash/a = c
+					a.worth -= amount
+					a.update_icon()
+					if(a.worth <= 0)
+						bank -= a
+						qdel(a)
+		if("item")
+			var/v = amount
+			while(v > 0)
+				for(var/obj/c in bank)
+					if(istype(c, accepted_itemtype))
+						c.forceMove(get_turf(loc))
+						qdel(c)
+						v -= accepted_item_worth
+
+/obj/trader/proc/return_funds()
+	var/u_get_refund = FALSE
+	switch(accepts)
+		if("coin")
+			if(coinbalance)
+				u_get_refund = TRUE
+			while(coinbalance > 0)
+				if(coinbalance >= 20)
+					new /obj/item/weapon/aliencoin/phoron(get_turf(loc))
+					coinbalance -= 20
+				else if(coinbalance >= 10)
+					new /obj/item/weapon/aliencoin/gold(get_turf(loc))
+					coinbalance -= 10
+				else if(coinbalance >= 5)
+					new /obj/item/weapon/aliencoin/silver(get_turf(loc))
+					coinbalance -= 5
+				else
+					new /obj/item/weapon/aliencoin/basic(get_turf(loc))
+					coinbalance --
+		if("money")
+			for(var/obj/c in bank)
+				u_get_refund = TRUE
+				c.forceMove(get_turf(loc))
+				bank -= c
+		if("item")
+			for(var/obj/c in bank)
+				u_get_refund = TRUE
+				c.forceMove(get_turf(loc))
+				bank -= c
+	if(u_get_refund)
+		visible_message("<span class='notice'>\The [src] drops the banked [welcome_accepts_name].</span>")
+	else
+		visible_message("<span class='notice'>\The [src] doesn't have anything banked for you.</span>")
+
+/obj/trader/proc/move_trader()
+	var/list/pt = list()
+	for(var/obj/move_trader_landmark/t in world)
+		if(t.trader_type == type)
+			pt += t
+	if(pt.len > 0)
+		var/obj/dt = pick(pt)
+		forceMove(get_turf(dt))
+		dir = dt.dir
+		log_admin("[src] has been placed at [loc], [x],[y],[z]")
+	else
+		log_and_message_admins("[src] tried to move itself but its target pick list was empty, so it was not moved. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
+
+/obj/move_trader_landmark //You need to place the trader somewhere in the world and enable the 'move_trader' var. When the trader initializes, it will make a list of these landmarks and then move itself.
+	name = "trader mover"
+	desc = "A trader can be moved to here!"
+	icon = 'icons/obj/landmark_vr.dmi'
+	icon_state = "blue-x"
+	invisibility = 101
+	mouse_opacity = 0
+	density = 0
+	anchored = 1
+	var/trader_type			//The type path for the trader you want to be able to land here.
+
+/obj/trader/capture_crystal
+	name = "curious trader"
+	desc = "A tall metal cylander on a squarish base. It looks almost like a vending machine, but there's nowhere to swipe your card. It appears to accept some kind of triangle currency..."
+	icon = 'icons/obj/vending_vr.dmi'
+	icon_state = "cap_crys"
+	interact_sound = list('sound/music/capture_crystal_1.ogg', 'sound/music/capture_crystal_2.ogg')
+	sound_cooldown = 1 MINUTE
+	start_products = list(
+		/obj/item/capture_crystal/basic,
+		/obj/item/capture_crystal/great,
+		/obj/item/capture_crystal/ultra,
+		/obj/item/capture_crystal/master,
+		/obj/item/capture_crystal/random
+	)
+	prices = list(
+		/obj/item/capture_crystal/basic = 5,
+		/obj/item/capture_crystal/great = 10,
+		/obj/item/capture_crystal/ultra = 15,
+		/obj/item/capture_crystal/master = 100,
+		/obj/item/capture_crystal/random = 10
+	)
+	multiple = list(
+		/obj/item/capture_crystal/basic = 10,
+		/obj/item/capture_crystal/great = 5,
+		/obj/item/capture_crystal/ultra = 2)
+
+/obj/trader/capture_crystal/cash
+	accepts = "money"
+	prices = list(
+		/obj/item/capture_crystal/basic = 500,
+		/obj/item/capture_crystal/great = 1000,
+		/obj/item/capture_crystal/ultra = 1500,
+		/obj/item/capture_crystal/master = 10000,
+		/obj/item/capture_crystal/random = 1000
+	)
+
+/obj/trader/general
+	name = "trader"
+	desc = "A large canine woman. She might have a few things to sell."
+	icon = 'icons/obj/traderx64.dmi'
+	icon_state = "trader1"
+	pixel_x = -16
+	layer = ABOVE_MOB_LAYER
+	plane = ABOVE_MOB_PLANE
+	welcome_msg = "Hey there, welcome~ If you've got any"
+	welcome_msg_finish = " then I may have something for you. Would you like to browse what I've got?"
+	pick_inventory = TRUE
+	pick_inventory_quantity = 5
+	start_products = list(
+		/obj/item/capture_crystal/basic = 100,
+		/obj/item/capture_crystal/random = 50,
+		/obj/item/device/perfect_tele = 10,
+		/obj/item/device/chameleon = 25,
+		/obj/item/weapon/gun/energy/sizegun/old = 25,
+		/obj/item/weapon/implant/sizecontrol = 25,
+		/obj/item/clothing/under/hyperfiber/bluespace = 25,
+		/obj/item/device/nif/authentic = 1,
+		/obj/item/toy/bosunwhistle = 50,
+		/obj/item/weapon/cell/infinite = 10,
+		/obj/item/weapon/cell/void = 15,
+		/obj/item/weapon/cell/device/weapon/recharge/alien = 10,
+		/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore = 50,
+		/obj/item/device/denecrotizer = 10,
+		/obj/item/clothing/shoes/boots/speed = 15,
+		/obj/item/weapon/bluespace_harpoon = 20,
+		/obj/item/weapon/telecube/randomized = 5,
+		/obj/item/device/bodysnatcher = 20,
+		/obj/item/device/survivalcapsule = 25,
+		/obj/item/device/survivalcapsule/luxury = 20,
+		/obj/item/device/survivalcapsule/luxurybar = 15,
+		/obj/item/device/survivalcapsule/popcabin = 20,
+		/obj/item/device/survivalcapsule/escapepod = 5
+		)
+	prices = list(
+		/obj/item/capture_crystal/basic = 6,
+		/obj/item/capture_crystal/random = 15,
+		/obj/item/device/perfect_tele = 20,
+		/obj/item/device/chameleon = 20,
+		/obj/item/weapon/gun/energy/sizegun/old = 10,
+		/obj/item/weapon/implant/sizecontrol = 10,
+		/obj/item/clothing/under/hyperfiber/bluespace = 10,
+		/obj/item/device/nif/authentic = 100,
+		/obj/item/toy/bosunwhistle = 1,
+		/obj/item/weapon/cell/infinite = 20,
+		/obj/item/weapon/cell/void = 20,
+		/obj/item/weapon/cell/device/weapon/recharge/alien = 20,
+		/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore = 3,
+		/obj/item/device/denecrotizer = 20,
+		/obj/item/clothing/shoes/boots/speed = 20,
+		/obj/item/weapon/bluespace_harpoon = 20,
+		/obj/item/weapon/telecube/randomized = 50,
+		/obj/item/device/bodysnatcher = 20,
+		/obj/item/device/survivalcapsule = 10,
+		/obj/item/device/survivalcapsule/luxury = 20,
+		/obj/item/device/survivalcapsule/luxurybar = 25,
+		/obj/item/device/survivalcapsule/popcabin = 10,
+		/obj/item/device/survivalcapsule/escapepod = 30
+		)
+	multiple = list(
+		/obj/item/capture_crystal/basic = 10,
+		/obj/item/capture_crystal/random = 2,
+		/obj/item/weapon/gun/energy/sizegun/old = 2,
+		/obj/item/weapon/implant/sizecontrol = 2,
+		/obj/item/clothing/under/hyperfiber/bluespace = 2,
+		/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore = 10
+		)

maps/expedition_vr/beach/beach.dmm

@@ -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

maps/gateway_vr/eggnogtown.dmm

@@ -650,7 +650,9 @@
 	pixel_x = 28;
 	pixel_y = -26
 	},
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
 /area/gateway/eggnogtown/greenhouse)
 "cD" = (
 /obj/structure/bonfire,
@@ -972,9 +974,7 @@
 "fS" = (
 /obj/machinery/portable_atmospherics/hydroponics/soil,
 /obj/machinery/light,
-/turf/simulated/floor/outdoors/grass/forest{
-	outdoors = 0
-	},
+/turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/eggnogtown/greenhouse)
 "fX" = (
 /obj/structure/grille,
@@ -1081,7 +1081,9 @@
 /area/gateway/eggnogtown/kitchihome/den)
 "gP" = (
 /obj/item/weapon/stool/padded,
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
 /area/gateway/eggnogtown/greenhouse)
 "gS" = (
 /turf/simulated/wall/wood,
@@ -1183,6 +1185,10 @@
 /obj/structure/bed/chair/sofa/black{
 	dir = 8
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/wood,
 /area/gateway/eggnogtown/hall/south)
 "iq" = (
@@ -1244,6 +1250,14 @@
 /obj/structure/simple_door/iron,
 /turf/simulated/floor/bmarble,
 /area/gateway/eggnogtown/arturoswolfden)
+"jy" = (
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
+/area/gateway/eggnogtown/greenhouse)
 "jB" = (
 /obj/structure/table/woodentable,
 /obj/item/toy/plushie/black_fox,
@@ -1279,9 +1293,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/outdoors/grass/forest{
-	outdoors = 0
-	},
+/turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/eggnogtown/greenhouse)
 "kG" = (
 /obj/machinery/telecomms/relay/preset/tether,
@@ -1918,7 +1930,10 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/gateway/eggnogtown/dining/storage)
 "tc" = (
-/turf/simulated/floor/outdoors/grass/forest{
+/obj/item/weapon/stool/padded{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/newdirt{
 	outdoors = 0
 	},
 /area/gateway/eggnogtown/greenhouse)
@@ -2010,9 +2025,7 @@
 /obj/machinery/alarm/alarms_hidden{
 	pixel_y = 21
 	},
-/turf/simulated/floor/outdoors/grass/forest{
-	outdoors = 0
-	},
+/turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/eggnogtown/greenhouse)
 "uk" = (
 /obj/machinery/light_switch{
@@ -2148,9 +2161,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/grass/forest{
-	outdoors = 0
-	},
+/turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/eggnogtown/greenhouse)
 "wj" = (
 /turf/simulated/wall/wood,
@@ -2725,7 +2736,9 @@
 /area/gateway/eggnogtown/vibeout)
 "Fd" = (
 /obj/structure/bonfire/permanent,
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
 /area/gateway/eggnogtown/greenhouse)
 "Fe" = (
 /turf/simulated/wall/wood,
@@ -2744,6 +2757,22 @@
 /obj/machinery/cell_charger,
 /turf/simulated/floor/reinforced,
 /area/gateway/eggnogtown/loniabode)
+"Fo" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/bmarble,
+/area/gateway/eggnogtown/hotsprings)
+"Fs" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/wood{
+	temperature = 258.15
+	},
+/area/gateway/eggnogtown)
 "Ft" = (
 /turf/simulated/floor/tiled/monotile,
 /area/gateway/eggnogtown/dining/botany)
@@ -3005,7 +3034,9 @@
 /turf/simulated/floor/tiled/monotile,
 /area/gateway/eggnogtown/dining/botany)
 "Jm" = (
-/turf/simulated/floor/outdoors/newdirt,
+/turf/simulated/floor/outdoors/newdirt{
+	outdoors = 0
+	},
 /area/gateway/eggnogtown/greenhouse)
 "Jp" = (
 /obj/machinery/door/airlock{
@@ -3104,6 +3135,10 @@
 /obj/structure/bed/chair/sofa/black{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/wood,
 /area/gateway/eggnogtown/hall/south)
 "KI" = (
@@ -4041,9 +4076,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/outdoors/grass/forest{
-	outdoors = 0
-	},
+/turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/eggnogtown/greenhouse)
 "XF" = (
 /turf/simulated/wall/wood,
@@ -6711,7 +6744,7 @@ Xp
 QT
 LJ
 Iw
-Iw
+Fo
 Iw
 Iw
 Iw
@@ -8095,8 +8128,8 @@ Xp
 Xp
 Yc
 kb
-tc
-tc
+wt
+wt
 YZ
 YZ
 YZ
@@ -8237,10 +8270,10 @@ Xp
 Xp
 iq
 wt
-tc
+wt
 hS
 YZ
-gP
+tc
 YZ
 YZ
 oN
@@ -8670,7 +8703,7 @@ Jm
 Jm
 YZ
 YZ
-tc
+wt
 Yc
 OH
 Wr
@@ -8805,13 +8838,13 @@ Xp
 Xp
 iq
 wt
-tc
+wt
 YZ
 YZ
-gP
+jy
 YZ
 YZ
-tc
+wt
 wt
 iq
 Xp
@@ -8947,13 +8980,13 @@ Xp
 Xp
 Yc
 uh
-tc
-tc
+wt
+wt
 YZ
 YZ
 YZ
-tc
-tc
+wt
+wt
 XE
 Yc
 Xp
@@ -17810,7 +17843,7 @@ aL
 aL
 aL
 aL
-nN
+Fs
 aL
 aL
 aL

maps/gateway_vr/eggnogtownunderground.dmm

@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+<<<<<<< HEAD
+=======
+"aa" = (
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 258.15
+	},
+/area/gateway/eggnogtown/underground)
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 "ab" = (
 /turf/simulated/mineral/ignore_cavegen{
 	temperature = 258.15
@@ -15,7 +23,62 @@
 	temperature = 258.15
 	},
 /area/gateway/eggnogtown/hotspring)
+<<<<<<< HEAD
 "af" = (
+=======
+"ae" = (
+/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 258.15
+	},
+/area/gateway/eggnogtown/underground)
+"af" = (
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"ag" = (
+/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 258.15
+	},
+/area/gateway/eggnogtown/underground)
+"ah" = (
+/obj/random/mob/semirandom_mob_spawner/vore/retaliate,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"ai" = (
+/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"aj" = (
+/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"ak" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/hotsprings)
+"al" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/hotsprings)
+"am" = (
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 /obj/machinery/light/small{
 	dir = 8
 	},
@@ -31,7 +94,23 @@
 	temperature = 258.15
 	},
 /area/gateway/eggnogtown/underground)
+<<<<<<< HEAD
 "ah" = (
+=======
+"ao" = (
+/obj/random/mob/semirandom_mob_spawner/vore/hostile,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"ap" = (
+/obj/random/awayloot,
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
+"aq" = (
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 /obj/machinery/camera/network/civilian{
 	dir = 5
 	},
@@ -47,6 +126,14 @@
 	temperature = 258.15
 	},
 /area/gateway/eggnogtown/underground)
+<<<<<<< HEAD
+=======
+"as" = (
+/turf/simulated/mineral/ignore_cavegen{
+	temperature = 258.15
+	},
+/area/gateway/eggnogtown/vibeout)
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 "ba" = (
 /obj/structure/table/wooden_reinforced,
 /obj/machinery/chemical_dispenser/bar_alc/full,
@@ -643,6 +730,15 @@
 	temperature = 258.15
 	},
 /area/gateway/eggnogtown/houserhomestead/basement)
+"MG" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/mineral/floor/ignore_cavegen{
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
 "Oa" = (
 /obj/structure/bed/chair/bay/comfy/black{
 	dir = 4
@@ -2496,9 +2592,15 @@ gA
 gA
 gA
 gA
+<<<<<<< HEAD
 Da
 Da
 Da
+=======
+af
+af
+MG
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 cb
 cb
 cb
@@ -2506,9 +2608,15 @@ cb
 cb
 cb
 cb
+<<<<<<< HEAD
 Da
 Da
 Da
+=======
+MG
+af
+af
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 gA
 gA
 gA

maps/gateway_vr/variable/arynthilake_a.dmm

@@ -1670,6 +1670,13 @@
 /obj/structure/table/bench/marble,
 /turf/simulated/floor/tiled/eris/white/techfloor,
 /area/gateway/arynthilake/dome)
+"FJ" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake)
 "FR" = (
 /obj/structure/ladder,
 /turf/simulated/floor/tiled/eris/dark/monofloor,
@@ -1681,6 +1688,13 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/wood,
 /area/gateway/arynthilake/dome)
+"Ga" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
 "Gc" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/weapon/book/manual/chef_recipes,
@@ -2016,6 +2030,13 @@
 /obj/structure/flora/tree/bigtree,
 /turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/arynthilake/dome)
+"NF" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
 "NG" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 6
@@ -2224,6 +2245,16 @@
 	outdoors = 1
 	},
 /area/gateway/arynthilake)
+"Sj" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating{
+	edge_blending_priority = 1;
+	outdoors = 1
+	},
+/area/gateway/arynthilake/gateway)
 "Ss" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 9
@@ -4179,7 +4210,7 @@ au
 al
 al
 al
-al
+FJ
 al
 al
 au
@@ -6358,7 +6389,7 @@ Nm
 fo
 hw
 hw
-Sw
+NF
 Sw
 ba
 DP
@@ -7210,7 +7241,7 @@ fo
 hw
 Nm
 hw
-Sw
+Ga
 Sw
 ba
 qK
@@ -10946,7 +10977,7 @@ bD
 bD
 Fm
 bH
-rs
+Sj
 Zr
 au
 au
@@ -17840,7 +17871,7 @@ au
 al
 al
 al
-al
+FJ
 au
 Zr
 au

maps/gateway_vr/variable/arynthilake_b.dmm

@@ -103,6 +103,13 @@
 /obj/random/mob/semirandom_mob_spawner/animal/retaliate/c,
 /turf/simulated/floor/outdoors/grass/forest,
 /area/gateway/arynthilake)
+"cP" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/arynthilake/dome)
 "cQ" = (
 /obj/random/mob/semirandom_mob_spawner/fish/e,
 /turf/simulated/floor/water,
@@ -556,6 +563,10 @@
 /obj/structure/bed/chair/sofa/brown/right{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/carpet,
 /area/gateway/arynthilake/dome)
 "kv" = (
@@ -845,6 +856,13 @@
 /obj/item/weapon/bedsheet/bluedouble,
 /turf/simulated/floor/carpet/bcarpet,
 /area/gateway/arynthilake/dome)
+"qh" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake)
 "qy" = (
 /obj/structure/table/fancyblack,
 /obj/item/weapon/flame/candle/candelabra,
@@ -890,6 +908,13 @@
 	outdoors = 1
 	},
 /area/gateway/arynthilake)
+"rv" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/outdoors/grass,
+/area/gateway/arynthilake/dome)
 "rz" = (
 /turf/simulated/floor/beach/sand/desert,
 /area/gateway/arynthilake/caves)
@@ -1435,6 +1460,16 @@
 /obj/effect/landmark/mcguffin_spawner,
 /turf/simulated/floor/plating/external,
 /area/gateway/arynthilake/caveruins)
+"FN" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating{
+	edge_blending_priority = 1;
+	outdoors = 1
+	},
+/area/gateway/arynthilake/gateway)
 "Gg" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -14182,7 +14217,7 @@ pa
 iL
 lt
 Ix
-MP
+FN
 Vo
 Vo
 Vo
@@ -17825,7 +17860,7 @@ lQ
 lQ
 lQ
 lQ
-nC
+rv
 iG
 nC
 nC
@@ -18398,7 +18433,7 @@ lQ
 iG
 nC
 nC
-cu
+cP
 cu
 hH
 cS
@@ -20763,7 +20798,7 @@ Vo
 sP
 sP
 sP
-sP
+qh
 sP
 sP
 Vo

maps/gateway_vr/variable/honlethhighlands_a.dmm

@@ -364,6 +364,13 @@
 /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate/b,
 /turf/simulated/floor/tiled/techfloor,
 /area/gateway/honlethhighlands/gate)
+"bP" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/kitchen)
 "bY" = (
 /obj/machinery/alarm/alarms_hidden{
 	pixel_y = 21
@@ -449,7 +456,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands/town/bar)
 "dF" = (
@@ -576,6 +585,10 @@
 /obj/structure/bed/chair/sofa/brown/left{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/gateway/honlethhighlands/gate)
 "gB" = (
@@ -735,7 +748,9 @@
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
 "kL" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/bar)
 "kS" = (
@@ -902,7 +917,9 @@
 	},
 /area/gateway/honlethhighlands/town/garden)
 "nx" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 4
+	},
 /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate,
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
@@ -1080,7 +1097,9 @@
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
 "qB" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 1
+	},
 /obj/random/junk,
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands/town/bar)
@@ -1340,7 +1359,9 @@
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
 "uu" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /obj/random/junk,
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/bar)
@@ -1390,6 +1411,12 @@
 /obj/random/awayloot,
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/xenobio)
+"vt" = (
+/obj/item/weapon/stool/padded{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/gateway/honlethhighlands/town/bar)
 "vG" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -1981,7 +2008,9 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
 "Ey" = (
@@ -2190,7 +2219,9 @@
 	},
 /area/gateway/honlethhighlands/town/garden)
 "JI" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
 "JL" = (
@@ -2279,6 +2310,10 @@
 	pixel_x = 19;
 	pixel_y = -9
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/gateway/honlethhighlands/gate)
 "Lk" = (
@@ -2566,6 +2601,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/xenobio)
+"Rx" = (
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/bar)
 "RA" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10
@@ -16369,7 +16414,7 @@ Aa
 dF
 yP
 JI
-JI
+Rx
 JI
 Ev
 he
@@ -16935,10 +16980,10 @@ aI
 he
 ro
 AF
-BS
+vt
 BS
 aP
-BS
+vt
 UN
 hN
 An
@@ -19229,7 +19274,7 @@ aI
 Tg
 lj
 uN
-lj
+bP
 lj
 lj
 lj

maps/gateway_vr/variable/honlethhighlands_b.dmm

@@ -306,6 +306,13 @@
 	temperature = 253.15
 	},
 /area/gateway/honlethhighlands/beach)
+"bq" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating,
+/area/gateway/honlethhighlands/town/xenobio)
 "bw" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10
@@ -431,7 +438,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands/town/bar)
 "dF" = (
@@ -563,6 +572,10 @@
 /obj/structure/bed/chair/sofa/brown/left{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/gateway/honlethhighlands/gate)
 "gB" = (
@@ -677,6 +690,12 @@
 /obj/item/modular_computer/console/preset/civilian,
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
+"jq" = (
+/obj/item/weapon/stool/padded{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/gateway/honlethhighlands/town/bar)
 "jE" = (
 /obj/machinery/gateway/brass{
 	pixel_y = 6
@@ -736,7 +755,9 @@
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
 "kL" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/bar)
 "kS" = (
@@ -1102,7 +1123,9 @@
 /turf/simulated/floor/tiled,
 /area/gateway/honlethhighlands/town/command)
 "qB" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 1
+	},
 /obj/random/junk,
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands/town/bar)
@@ -1361,7 +1384,9 @@
 	},
 /area/gateway/honlethhighlands/town)
 "uu" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /obj/random/junk,
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/bar)
@@ -1382,7 +1407,9 @@
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/kitchen)
 "uP" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 4
+	},
 /obj/random/mob/semirandom_mob_spawner/humanoid,
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
@@ -1983,7 +2010,9 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
 "EP" = (
@@ -2183,7 +2212,9 @@
 	},
 /area/gateway/honlethhighlands/town/garden)
 "JI" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
 "JL" = (
@@ -2273,6 +2304,10 @@
 	pixel_x = 19;
 	pixel_y = -9
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/gateway/honlethhighlands/gate)
 "Lk" = (
@@ -2359,7 +2394,9 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/gateway/honlethhighlands)
 "Nt" = (
-/obj/item/weapon/stool/padded,
+/obj/item/weapon/stool/padded{
+	dir = 1
+	},
 /obj/random/mob/semirandom_mob_spawner/humanoid,
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands/town/bar)
@@ -2643,6 +2680,16 @@
 /obj/structure/window/reinforced/full,
 /turf/simulated/floor/plating,
 /area/gateway/honlethhighlands/town/kitchen)
+"TA" = (
+/obj/item/weapon/stool/padded{
+	dir = 8
+	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/lino,
+/area/gateway/honlethhighlands/town/bar)
 "TE" = (
 /obj/random/awayloot,
 /turf/simulated/floor/outdoors/rocks{
@@ -16408,7 +16455,7 @@ Aa
 dF
 yP
 JI
-JI
+TA
 JI
 Ev
 he
@@ -16974,7 +17021,7 @@ aI
 he
 ro
 AF
-BS
+jq
 BS
 aP
 Nt
@@ -17289,7 +17336,7 @@ vi
 lk
 em
 px
-lk
+bq
 Dk
 aI
 aI

maps/gateway_vr/wildwest.dmm

@@ -515,7 +515,9 @@
 /turf/simulated/floor/tiled/white,
 /area/awaymission/wwmines)
 "dM" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 1
+	},
 /mob/living/simple_mob/humanoid/merc/ranged,
 /turf/simulated/floor/wood,
 /area/awaymission/wwmines)
@@ -827,7 +829,9 @@
 /turf/simulated/wall/sandstone,
 /area/awaymission/wwmines)
 "fT" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/awaymission/wwmines)
 "fW" = (
@@ -1379,7 +1383,9 @@
 /turf/simulated/floor/grass,
 /area/awaymission/wwgov)
 "we" = (
-/obj/item/weapon/stool,
+/obj/item/weapon/stool{
+	dir = 1
+	},
 /mob/living/simple_mob/humanoid/merc/melee,
 /turf/simulated/floor/wood,
 /area/awaymission/wwmines)

maps/offmap_vr/talon/talon_v2.dmm

@@ -3572,6 +3572,13 @@
 /obj/machinery/portable_atmospherics/canister/empty/phoron,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/port_store)
+"lj" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating,
+/area/talon_v2/engineering/star_store)
 "lk" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -4482,6 +4489,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/crew_quarters/bar)
+"oi" = (
+/obj/structure/catwalk,
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating,
+/area/talon_v2/maintenance/fore_port)
 "ok" = (
 /obj/structure/bed/pod,
 /obj/item/weapon/bedsheet/brown,
@@ -23306,7 +23321,7 @@ aa
 lT
 Re
 Re
-XQ
+oi
 XQ
 XQ
 jQ
@@ -28030,7 +28045,7 @@ aL
 oE
 iH
 tS
-in
+lj
 in
 in
 in

maps/om_adventure/pois/cabin1.dmm

@@ -95,6 +95,13 @@
 /obj/item/weapon/flame/candle,
 /turf/simulated/floor/wood,
 /area/om_adventure/poi/cabin1)
+"G" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "H" = (
 /obj/structure/table/woodentable,
 /obj/random/tech_supply,
@@ -119,6 +126,10 @@
 /obj/structure/bed/chair/sofa/brown/left{
 	dir = 8
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/wood,
 /area/om_adventure/poi/cabin1)
 "S" = (
@@ -248,7 +259,7 @@ s
 r
 Q
 a
-a
+G
 a
 a
 "}

maps/om_adventure/pois/cabin2.dmm

@@ -30,6 +30,13 @@
 /obj/random/multiple/underdark/treasure,
 /turf/simulated/floor/bmarble,
 /area/om_adventure/poi/cabin2)
+"m" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "n" = (
 /obj/tether_away_spawner/spookyland,
 /turf/simulated/floor/wood,
@@ -127,6 +134,10 @@
 /obj/structure/bed/chair/sofa/brown/right{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/om_adventure/poi/cabin2)
 "L" = (
@@ -250,7 +261,7 @@ H
 r
 Q
 M
-a
+m
 z
 a
 M

maps/om_adventure/pois/camp.dmm

@@ -2,6 +2,13 @@
 "a" = (
 /turf/template_noop,
 /area/template_noop)
+"i" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "n" = (
 /obj/structure/table/rack/steel,
 /obj/fiftyspawner/log,
@@ -35,6 +42,13 @@
 /obj/item/weapon/storage/box/matches,
 /turf/simulated/floor/outdoors/newdirt,
 /area/om_adventure/poi/camp)
+"Y" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/outdoors/newdirt,
+/area/om_adventure/poi/camp)
 
 (1,1,1) = {"
 a
@@ -86,7 +100,7 @@ a
 a
 a
 H
-a
+i
 M
 H
 x
@@ -185,7 +199,7 @@ a
 a
 a
 H
-H
+Y
 x
 a
 a

maps/om_adventure/pois/medicalcenter.dmm

@@ -17,6 +17,13 @@
 /obj/tether_away_spawner/spookyland,
 /turf/simulated/floor/tiled/eris/white/orangecorner,
 /area/om_adventure/poi/medicalcenter)
+"p" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/tiled/eris/white/orangecorner,
+/area/om_adventure/poi/medicalcenter)
 "q" = (
 /turf/simulated/floor/tiled/eris/white/orangecorner,
 /area/om_adventure/poi/medicalcenter)
@@ -46,6 +53,10 @@
 /obj/structure/bed/chair/sofa/blue/left{
 	dir = 8
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor/tiled/eris/white/orangecorner,
 /area/om_adventure/poi/medicalcenter)
 "A" = (
@@ -207,7 +218,7 @@ q
 H
 q
 A
-q
+p
 W
 q
 k

maps/om_adventure/pois/shippart1.dmm

@@ -17,6 +17,13 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/plating/eris/under,
 /area/om_adventure/poi/shippart1)
+"i" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "j" = (
 /obj/tether_away_spawner/spookyland,
 /turf/template_noop,
@@ -65,6 +72,13 @@
 /obj/structure/salvageable/bliss,
 /turf/simulated/floor/tiled/eris/dark/monofloor,
 /area/om_adventure/poi/shippart1)
+"K" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "M" = (
 /obj/item/weapon/material/shard,
 /obj/effect/floor_decal/rust,
@@ -133,7 +147,7 @@ a
 a
 a
 a
-a
+i
 a
 a
 a
@@ -354,7 +368,7 @@ a
 a
 a
 a
-a
+K
 a
 a
 X

maps/om_adventure/pois/shuttlewreck2.dmm

@@ -64,6 +64,10 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/shuttle/floor/white,
 /area/om_adventure/poi/shuttlewreck2)
 "r" = (
@@ -79,6 +83,10 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/shuttle/floor/white,
 /area/om_adventure/poi/shuttlewreck2)
 "w" = (

maps/om_adventure/pois/shuttlewreck4.dmm

@@ -30,6 +30,13 @@
 "q" = (
 /turf/simulated/floor/tiled/eris/dark/monofloor,
 /area/om_adventure/poi/shuttlewreck4)
+"r" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "t" = (
 /obj/structure/bed/chair/bay/shuttle{
 	dir = 4
@@ -46,6 +53,13 @@
 "v" = (
 /turf/simulated/wall/eris/r_wall,
 /area/om_adventure/poi/shuttlewreck4)
+"w" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/template_noop,
+/area/template_noop)
 "x" = (
 /turf/simulated/floor/plating/eris/airless,
 /area/om_adventure/poi/shuttlewreck4)
@@ -157,7 +171,7 @@ j
 a
 a
 j
-j
+w
 a
 j
 h
@@ -361,7 +375,7 @@ j
 j
 j
 j
-j
+r
 j
 j
 j

maps/om_adventure/pois/woodentemple.dmm

@@ -136,6 +136,23 @@
 	},
 /turf/simulated/floor/wood,
 /area/om_adventure/poi/woodentemple)
+<<<<<<< HEAD
+=======
+"W" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/wood,
+/area/om_adventure/poi/woodentemple)
+"X" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/wood,
+/area/om_adventure/poi/woodentemple)
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 "Z" = (
 /turf/simulated/wall/hardwood,
 /area/om_adventure/poi/woodentemple)
@@ -220,7 +237,7 @@ C
 j
 d
 A
-d
+X
 m
 N
 Q

maps/stellardelight/ship_centcom.dmm

@@ -522,6 +522,18 @@
 /obj/structure/closet/walllocker/medical/east,
 /turf/simulated/floor/tiled,
 /area/centcom/terminal/tramfluff)
+<<<<<<< HEAD
+=======
+"bF" = (
+/turf/simulated/floor/reinforced,
+/area/shuttle/centcom/ccbay)
+"bG" = (
+/obj/trader/general{
+	move_trader = 1
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/centcom/ccbay)
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 "bJ" = (
 /obj/structure/table/rack,
 /obj/item/weapon/storage/box/pillbottles,
@@ -28602,7 +28614,7 @@ bS
 fR
 bY
 lM
-Bx
+bG
 Bx
 Bx
 Bx

maps/stellardelight/stellar_delight3.dmm

@@ -9931,6 +9931,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/portfore)
 "Ki" = (
@@ -10218,6 +10222,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tcommsat/computer)
+"Li" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/starboardaft)
 "Lm" = (
 /obj/item/device/paicard,
 /obj/structure/table/glass,
@@ -27101,9 +27112,15 @@ NL
 NL
 qy
 NL
+<<<<<<< HEAD
 Yg
 dE
 dE
+=======
+by
+Li
+KJ
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 le
 ww
 ww

maps/tether/submaps/tether_centcom.dmm

@@ -3401,6 +3401,12 @@
 /obj/machinery/computer/skills,
 /turf/simulated/floor/tiled/dark,
 /area/centcom/security)
+"lt" = (
+/obj/trader/general{
+	move_trader = 1
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/centcom/ccbay)
 "lu" = (
 /obj/machinery/light{
 	dir = 8
@@ -28624,7 +28630,7 @@ bS
 fR
 bY
 ac
-nJ
+lt
 nJ
 nJ
 nJ

maps/tether/tether-02-surface2.dmm

@@ -33779,6 +33779,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
+"jSc" = (
+/obj/move_trader_landmark{
+	dir = 8;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/southhall)
 "jUQ" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 8
@@ -34455,9 +34462,19 @@
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/funny/hideyhole)
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
 ||||||| parent of 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid
 =======
+=======
+"opK" = (
+/obj/move_trader_landmark{
+	dir = 4;
+	trader_type = /obj/trader/general
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/lower/rnd)
+>>>>>>> 0f8b721e894... Merge pull request #12331 from Very-Soft/liddolawaytweaks
 "oXH" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -45716,7 +45733,7 @@ avD
 aBJ
 aCw
 avD
-aEc
+opK
 aED
 aFi
 aFT
@@ -52251,7 +52268,7 @@ bkq
 bkG
 bgU
 blk
-blG
+jSc
 blT
 bmb
 aab