diff --git a/code/_helpers/atmospherics.dm b/code/_helpers/atmospherics.dm
index 2f2d1f2b63..83b5982f13 100644
--- a/code/_helpers/atmospherics.dm
+++ b/code/_helpers/atmospherics.dm
@@ -21,8 +21,9 @@
var/total_moles = mixture.total_moles
results += "Pressure: [round(pressure,0.1)] kPa"
for(var/mix in mixture.gas)
- results += "[gas_data.name[mix]]: [round((mixture.gas[mix] / total_moles) * 100)]%"
+ results += "[gas_data.name[mix]]: [round((mixture.gas[mix] / total_moles) * 100)]% ([round(mixture.gas[mix], 0.01)] moles)"
results += "Temperature: [round(mixture.temperature-T0C)]°C"
+ results += "Heat Capacity: [round(mixture.heat_capacity(),0.1)]"
else
results += "\The [target] is empty!"
diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm
index 243c0ea871..cc258e42cb 100644
--- a/code/datums/supplypacks/munitions_vr.dm
+++ b/code/datums/supplypacks/munitions_vr.dm
@@ -8,7 +8,7 @@
containertype = /obj/structure/closet/crate/secure
containername = "frontier phaser crate"
access = access_explorer
-
+
/datum/supply_pack/munitions/expeditionbows
name = "Frontier bows (station-locked) crate"
contains = list(
@@ -57,4 +57,14 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Mining disperser charge crate"
- access = access_security
\ No newline at end of file
+ access = access_security
+
+/datum/supply_pack/munitions/longsword
+ name = "Weapons - Melee -Longsword (Steel)"
+ contains = list(
+ /obj/item/weapon/material/twohanded/longsword=2
+ )
+ cost = 50
+ containertype = /obj/structure/closet/crate/secure
+ containername = "longsword"
+ access = access_armory
\ No newline at end of file
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 845a0db0d0..37a5b837f8 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -171,7 +171,7 @@
pixel_y = rand(6,-6)
START_PROCESSING(SSobj, src)
//50% chance to grow up
- if(prob(50))
+ if(amount_grown != -1 && prob(50))
amount_grown = 1
get_light_and_color(parent)
..()
diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm
index f21738dd80..17f7a56caa 100644
--- a/code/game/objects/items/weapons/material/twohanded_vr.dm
+++ b/code/game/objects/items/weapons/material/twohanded_vr.dm
@@ -7,3 +7,30 @@
slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi',
)
desc = "An infernum made riding crop with Malady Blanche engraved in the shaft. It's a little worn from how many butts it has spanked."
+
+/obj/item/weapon/material/twohanded/longsword
+ w_class = ITEMSIZE_NORMAL
+ name = "longsword"
+ desc = "a more elegant weapon from a more civilised age"
+ icon= 'icons/obj/weapons_vr.dmi'
+ icon_state = "longsword"
+ base_icon = "longsword"
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi',
+ )
+ item_state = "saber"
+ unwielded_force_divisor = 0.1
+ force_divisor = 0.3
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ edge = TRUE
+ sharp = TRUE
+
+
+/obj/item/weapon/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+ if (src.wielded == 1)
+ if(unique_parry_check(user, attacker, damage_source) && prob(50))
+ user.visible_message("\The [user] parries [attack_text] with \the [src]!")
+ playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
+ return 1
+ return 0
diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm
index 2c50bd968f..b5e5fdae87 100644
--- a/code/game/objects/structures/trash_pile_vr.dm
+++ b/code/game/objects/structures/trash_pile_vr.dm
@@ -24,7 +24,8 @@
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/projectile/pirate,
/obj/item/clothing/accessory/permit/gun,
- /obj/item/weapon/gun/projectile/dartgun
+ /obj/item/weapon/gun/projectile/dartgun,
+ /obj/item/clothing/gloves/black/bloodletter
)
var/global/list/allocated_gamma = list()
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index fb07754d1e..11f0b9d1cc 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -130,7 +130,7 @@
/turf/simulated/wall/attackby(var/obj/item/weapon/W, var/mob/user)
user.setClickCooldown(user.get_attack_speed(W))
-
+
if(!construction_stage && user.a_intent == I_HELP)
if(try_graffiti(user,W))
return
@@ -240,7 +240,7 @@
return
// Basic dismantling.
- var/dismantle_toolspeed = 0
+ //var/dismantle_toolspeed = 0
if(isnull(construction_stage) || !reinf_material)
var/cut_delay = 60 - material.cut_delay
@@ -260,7 +260,7 @@
else if(istype(W,/obj/item/weapon/melee/energy/blade))
dismantle_sound = "sparks"
dismantle_verb = "slicing"
- dismantle_toolspeed = 1
+ //dismantle_toolspeed = 1
cut_delay *= 0.5
else if(istype(W,/obj/item/weapon/pickaxe))
var/obj/item/weapon/pickaxe/P = W
diff --git a/code/modules/clothing/gloves/miscellaneous_vr.dm b/code/modules/clothing/gloves/miscellaneous_vr.dm
index 2563575af0..4dee540772 100644
--- a/code/modules/clothing/gloves/miscellaneous_vr.dm
+++ b/code/modules/clothing/gloves/miscellaneous_vr.dm
@@ -34,7 +34,7 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
-
+
/obj/item/clothing/gloves/combat/knight/brown
desc = "ye olde armored gauntlets"
name = "knight gauntlets"
@@ -54,13 +54,13 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
-
+
/obj/item/clothing/gloves/combat/knight_costume/brown
desc = "ye olde armored gauntlets"
name = "knight gauntlets"
icon_state = "brown"
item_state = "brown"
-
+
/obj/item/clothing/gloves/heavy_engineer
desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'."
name = "heavy-duty engineering gloves"
@@ -80,4 +80,9 @@
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
\ No newline at end of file
+ max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+
+/obj/item/clothing/gloves/black/bloodletter
+ desc = "A pair of ordinary looking black gloves. On closer examination, they seem somewhat well-made, with an almost metallic sheen to them."
+ description_fluff = "A prohibited concealed weapon, the Melee Grip Reinforcement system is the product of the military applications of nanotechnology. The striking face of the glove hardens in response to impact, producing monofilament blades from the knuckles to greatly enhance the wearer's close-combat lethality."
+ special_attack_type = /datum/unarmed_attack/hardclaws
diff --git a/code/modules/clothing/head/fishing.dm b/code/modules/clothing/head/fishing.dm
new file mode 100644
index 0000000000..4ca39f18ab
--- /dev/null
+++ b/code/modules/clothing/head/fishing.dm
@@ -0,0 +1,118 @@
+//these just use the default inhands for soft caps because the amount of extra work to add more colours would be insane otherwise
+
+/obj/item/clothing/head/fishing
+ name = "fishing hat"
+ desc = "It's a peaked cap with a quirky slogan."
+ icon = 'icons/inventory/head/item_vr_fishing.dmi'
+ icon_state = "greensoft0"
+ item_state_slots = list(slot_r_hand_str = "greensoft", slot_l_hand_str = "greensoft", slot_head_str = "greensoft0")
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_hats.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_hats.dmi',
+ slot_head_str = 'icons/inventory/head/mob_vr_fishing.dmi'
+ )
+ siemens_coefficient = 0.9
+ body_parts_covered = 0
+ var/slogan = ""
+ var/hatsize = 0
+
+/obj/item/clothing/head/fishing/Initialize()
+ //short phrases that women and fish may have about you
+ var/feelings = list("love me",
+ "fear me",
+ "despise me",
+ "are ambivalent towards me",
+ "don't care about me",
+ "lust after me",
+ "eat me",
+ "are down bad for me",
+ "can't stand me",
+ "want me",
+ "kill me",
+ "devour me",
+ "swallow me",
+ "avoid me",
+ "have no words for me",
+ "hate me",
+ "make memes of me",
+ "demoralise me",
+ "perpetually mock me",
+ "scare me",
+ "issue restraining orders to me",
+ "leave me",
+ "took the kids from me",
+ "demand satisfaction from me",
+ "dropkick me",
+ "suplex me",
+ "worry about me",
+ "gossip about me",
+ "defame me",
+ "conspire against me",
+ "draw me as the soyjack",
+ "put me in their tummies",
+ "crunchatize me, cap'n!",
+ "think of me while kneading dough",
+ "leave threatening messages on my voicemail",
+ "write fanfiction about me",
+ "attempt to approach me"
+ )
+ //significantly more complex feelings that women and fish may have about you
+ var/verylongfeelings = list("construct inferior defensive walls lacking additional fall back locations as they believe their initial defense shall be enough to withstand me",
+ "insist upon forming an unsteady yet reliable alliance in which they teeter upon the dual edge of betrayal and ruination in the perpetual desire to bring ruin upon me",
+ "construct elaborate fantasies about my graphic and harrowing death at the hands of a giant robot",
+ "call it oven when you of in the cold food of out hot eat the food",
+ "are hurled millennia into the future for their hubris but nonetheless attempt to enslave me from my abode deep within the earth",
+ "make light of my attire while at the coffee shop, unaware that I am a powerful wizard with the means to cast forth the veil of ignorance from their eyes",
+ "cower before my T-posing to assert dominance, except I don't know the difference between T-posing and A-posing (neither of which have anything to do with T&A, which is very confusing)",
+ "use my power to create a new universe but destroy all life on earth in the process and are left alone to rebuild with nothing for company but me",
+ "hold A to charge a buster shot only to get hit by my homing missiles, starting a juggle chain which results in losing all their health and having to restart from the last checkpoint",
+ "attempt once more to best me and gain access to my keep of riches and treasure, but I put their foolish ambitions to rest with force",
+ "bump into me in the supermarket and exchange an awkward hello, neither of us expecting to meet each other in this liminal environs and unsure how the context of our relationship can adapt to this happenstance congregation",
+ "pursue me to the ends of the earth, constantly thwarted by inconsequential setbacks, and when they catch up and I ask in an exasperated voice why they respond 'you owe me a dollar'",
+ "call me just to 'chat' but actually mention they are moving and, obviously, since I'm the ONLY guy they know with a truck it would be great if I could help out, they said they'd buy me pizza but that doesn't really cover it",
+ "shuffle uncomfortably as we continue to sit in near-total silence having exhausted all topics of conversation hours ago but neither of us having worked up the spirit to suggest that we part ways and go home",
+ "methodically place brick after agonising brick in the wall they are constructing to forever entomb me in the basement which they claimed contained a case of Amontillado wine"
+ )
+
+ //time to actually generate the slogan
+ //50% chance of it just being a basic women/fish combo
+ if(prob(50))
+ slogan = "Women [pick(feelings)], fish [pick(feelings)]"
+ else //we generate something more complex
+ if(prob(90)) //USUALLY one of the short simple phrases
+ slogan = "[pick("Women", "Fish")] [pick(feelings)]"
+ else
+ slogan = "[pick("Women", "Fish")] [pick(verylongfeelings)]"
+ hatsize += 2
+
+ //second line
+ if(prob(90)) //USUALLY one of the short simple phrases
+ slogan = "[slogan], [pick("Women", "Fish")] [pick(feelings)]"
+ else
+ slogan = "[slogan], [pick("Women", "Fish")] [pick(verylongfeelings)]"
+ hatsize += 2
+ //chance of a third line
+ if(prob(50))
+ if(prob(50)) //if a third line is rolled it's way more likely to be a long one
+ slogan = "[slogan], [pick("Women", "Fish", "Men", "Beasts")] [pick(feelings)]"
+ hatsize += 1
+ else
+ slogan = "[slogan], [pick("Women", "Fish", "Men", "Beasts")] [pick(verylongfeelings)]"
+ hatsize += 3
+ //you can even get a fourth
+ if(prob(25))
+ if(prob(25)) //if a fourth line is rolled it's way WAY more likely to be a long one
+ slogan = "[slogan], [pick("Women", "Fish", "Men", "Beasts")] [pick(feelings)]"
+ hatsize += 1
+ else
+ slogan = "[slogan], [pick("Women", "Fish", "Men", "Beasts")] [pick(verylongfeelings)]"
+ hatsize += 3
+
+
+ //now we have the slogan, apply this to the description and name
+ desc = "A peaked cap with text reading '[slogan]'."
+ name = "\improper '[slogan]' hat"
+
+ //finally, take our hat size and pick the icon accordingly
+ icon_state = "greensoft[hatsize]"
+ item_state_slots = list(slot_r_hand_str = "greensoft", slot_l_hand_str = "greensoft", slot_head_str = "greensoft[hatsize]")
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm
index b4e748713f..96d6448fd2 100644
--- a/code/modules/clothing/under/accessories/armor.dm
+++ b/code/modules/clothing/under/accessories/armor.dm
@@ -336,8 +336,8 @@
icon_state = "comtag"
/obj/item/clothing/accessory/armor/tag/nt
- name = "\improper CORPORATE SECURITY tag"
- desc = "An armor tag with the words CORPORATE SECURITY printed in red lettering on it."
+ name = "\improper NANOTRASEN tag"
+ desc = "An armor tag with the word NANOTRASEN printed in red lettering on it and an accompanying company logo."
icon_state = "nanotag"
/obj/item/clothing/accessory/armor/tag/pcrc
@@ -345,9 +345,9 @@
desc = "An armor tag with the words PROXIMA CENTAURI RISK CONTROL printed in cyan lettering on it."
icon_state = "pcrctag"
-/obj/item/clothing/accessory/armor/tag/saare
- name = "\improper SAARE tag"
- desc = "An armor tag with the acronym SAARE printed in olive-green lettering on it."
+/obj/item/clothing/accessory/armor/tag/hedberg
+ name = "\improper HEDBERG-HAMMARSTROM tag"
+ desc = "An armor tag with the name HEDBERG-HAMMARSTROM printed in olive-green lettering on it."
icon_state = "saaretag"
/obj/item/clothing/accessory/armor/tag/opos
diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm
index dc17952375..0a24136e4d 100644
--- a/code/modules/economy/trader.dm
+++ b/code/modules/economy/trader.dm
@@ -24,6 +24,7 @@
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)
. = ..()
@@ -39,6 +40,8 @@
var/obj/p = new item(src)
products += p
start_products -= item
+ if(move_trader)
+ move_trader()
/obj/trader/Destroy()
. = ..()
@@ -127,7 +130,6 @@
to_chat(user, "You aren't close enough.")
trading = FALSE
return
- visible_message("\The [src] drops the banked [welcome_accepts_name].")
return_funds()
else
to_chat(user, "You decided leave your change banked.")
@@ -199,6 +201,9 @@
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)
@@ -209,8 +214,11 @@
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))
@@ -226,12 +234,42 @@
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("\The [src] drops the banked [welcome_accepts_name].")
+ else
+ visible_message("\The [src] doesn't have anything banked for you.")
+
+/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. (JMP)")
+
+/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"
@@ -298,7 +336,13 @@
/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/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,
@@ -317,7 +361,13 @@
/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/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,
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index d63857badf..9510f5aeba 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -848,13 +848,15 @@
/obj/item/weapon/storage/box/wormcan/sickly = 10,
/obj/item/weapon/material/fishing_net = 2,
/obj/item/glass_jar/fish = 4,
- /obj/item/stack/cable_coil/random = 6)
+ /obj/item/stack/cable_coil/random = 6,
+ /obj/item/clothing/head/fishing = 5)
prices = list(/obj/item/weapon/material/fishing_rod/modern/cheap = 50,
/obj/item/weapon/storage/box/wormcan = 12,
/obj/item/weapon/storage/box/wormcan/sickly = 6,
/obj/item/weapon/material/fishing_net = 40,
/obj/item/glass_jar/fish = 10,
- /obj/item/stack/cable_coil/random = 4)
+ /obj/item/stack/cable_coil/random = 4,
+ /obj/item/clothing/head/fishing = 15)
premium = list(/obj/item/weapon/storage/box/wormcan/deluxe = 1)
contraband = list(/obj/item/weapon/storage/box/wormcan/deluxe = 1)
diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index 4bb55178f6..531b525453 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -140,4 +140,42 @@
/decl/emote/audible/squeaky
key = "squeaky"
emote_message_3p = "squeaks."
- emote_sound = 'sound/items/drop/plushie.ogg'
\ No newline at end of file
+ emote_sound = 'sound/items/drop/plushie.ogg'
+
+/decl/emote/audible/gyoh
+ key = "gyoh"
+ emote_message_3p = "gyohs."
+ emote_sound = 'sound/voice/teppi/whine1.ogg'
+ var/list/bigsound = list('sound/voice/teppi/gyooh1.ogg', 'sound/voice/teppi/gyooh2.ogg', 'sound/voice/teppi/gyooh3.ogg', 'sound/voice/teppi/gyooh4.ogg', 'sound/voice/teppi/gyooh5.ogg','sound/voice/teppi/gyooh6.ogg')
+ var/list/smolsound = list('sound/voice/teppi/whine1.ogg', 'sound/voice/teppi/whine2.ogg')
+
+/decl/emote/audible/gyoh/get_emote_sound(var/mob/living/user)
+ if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
+ if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
+ emote_sound = pick(smolsound)
+ else
+ emote_sound = pick(bigsound)
+ else if(user.size_multiplier >= 1.5)
+ emote_sound = pick(bigsound)
+ else
+ emote_sound = pick(smolsound)
+ . = ..()
+
+/decl/emote/audible/rumble
+ key = "rumble"
+ emote_message_3p = "rumbles contentedly."
+ emote_sound = 'sound/voice/teppi/whine1.ogg'
+ var/list/bigsound = list('sound/voice/teppi/rumble.ogg')
+ var/list/smolsound = list('sound/voice/teppi/cute_rumble.ogg')
+
+/decl/emote/audible/rumble/get_emote_sound(var/mob/living/user)
+ if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
+ if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
+ emote_sound = pick(smolsound)
+ else
+ emote_sound = pick(bigsound)
+ else if(user.size_multiplier >= 1.5)
+ emote_sound = pick(bigsound)
+ else
+ emote_sound = pick(smolsound)
+ . = ..()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 43b1de9a3c..45862d64d8 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -132,10 +132,11 @@ var/list/_human_default_emotes = list(
/decl/emote/audible/squeaky,
/decl/emote/visible/mlem,
/decl/emote/visible/blep,
-
/decl/emote/helper/vwag,
/decl/emote/helper/vflap,
/decl/emote/audible/prbt,
+ /decl/emote/audible/gyoh,
+ /decl/emote/audible/rumble
//VOREStation Add End
//YW ADDITION: Add Start
/decl/emote/audible/chirp,
@@ -271,7 +272,9 @@ var/list/_simple_mob_default_emotes = list(
/decl/emote/audible/squeaky,
/decl/emote/visible/mlem,
/decl/emote/visible/blep,
- /decl/emote/audible/prbt
+ /decl/emote/audible/prbt,
+ /decl/emote/audible/gyoh,
+ /decl/emote/audible/rumble
)
//VOREStation Add End
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 995bcfa97f..9dd1eaffe7 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -54,7 +54,7 @@
var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes.
var/allergens = null // Things that will make this species very sick
var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_BLURRY|AG_CONFUSE // What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses. VOREStation Edit'd.
- var/allergen_damage_severity = 5 // How bad are reactions to the allergen? Touch with extreme caution. VOREStation Edit'd.
+ var/allergen_damage_severity = 4 // How bad are reactions to the allergen? Touch with extreme caution. VOREStation Edit'd.
var/allergen_disable_severity = 4 // Whilst this determines how long nonlethal effects last and how common emotes are. VOREStation Edit'd.
var/min_age = 17
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index 71eb5682a2..99955034cc 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -314,7 +314,7 @@ YW change end */
desc = "This trait drastically reduces the effects of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)."
cost = 0
custom_only = FALSE
- var_changes = list("allergen_damage_severity" = 2.5, "allergen_disable_severity" = 3)
+ var_changes = list("allergen_damage_severity" = 2, "allergen_disable_severity" = 3)
excludes = list(/datum/trait/neutral/allergen_increased_effect)
/datum/trait/neutral/allergen_increased_effect
@@ -322,7 +322,7 @@ YW change end */
desc = "This trait drastically increases the effects of allergen reactions, enough that even a small dose can be lethal. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)."
cost = 0
custom_only = FALSE
- var_changes = list("allergen_damage_severity" = 10, "allergen_disable_severity" = 6)
+ var_changes = list("allergen_damage_severity" = 8, "allergen_disable_severity" = 6)
excludes = list(/datum/trait/neutral/allergen_reduced_effect)
// Spicy Food Traits, from negative to positive.
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index e3fb8a3392..5257f59d77 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -422,7 +422,9 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/gripper(src)
src.modules += new /obj/item/weapon/gripper/circuit(src)
src.modules += new /obj/item/device/lightreplacer(src)
- src.modules += new /obj/item/device/pipe_painter(src)
+ // RPDs do this already
+ //src.modules += new /obj/item/device/pipe_painter(src)
+ src.modules += new /obj/item/weapon/pipe_dispenser(src)
src.modules += new /obj/item/device/floor_painter(src)
src.modules += new /obj/item/weapon/inflatable_dispenser/robot(src)
src.emag = new /obj/item/weapon/melee/baton/robot/arm(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index 2bb65ec9e3..e862c5a4b5 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -487,6 +487,8 @@
src.modules += new /obj/item/weapon/storage/part_replacer(src)
src.modules += new /obj/item/device/robotanalyzer(src)
src.modules += new /obj/item/weapon/card/robot(src)
+ //Added a circuit gripper
+ src.modules += new /obj/item/weapon/gripper/circuit(src)
src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src)
src.modules += new /obj/item/weapon/gripper/no_use/mech(src)
src.emag = new /obj/item/weapon/hand_tele(src)
@@ -570,9 +572,11 @@
src.modules += new /obj/item/device/dogborg/boop_module(src)
src.modules += new /obj/item/weapon/gripper(src)
src.modules += new /obj/item/weapon/gripper/circuit(src)
- src.modules += new /obj/item/device/pipe_painter(src)
+ // The RPD does the exact same thing, this just take space.
+ //src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/device/floor_painter(src)
src.modules += new /obj/item/weapon/rms(src)
+ src.modules += new /obj/item/weapon/pipe_dispenser(src)
src.emag = new /obj/item/weapon/dogborg/pounce(src)
src.modules += new /obj/item/weapon/pipe_dispenser(src) //YW change
@@ -831,6 +835,8 @@
R.wideborg = TRUE
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
+ R.verbs |= /mob/living/proc/toggle_rider_reins
+ R.verbs |= /mob/living/proc/shred_limb
R.verbs |= /mob/living/silicon/robot/proc/rest_style
..()
diff --git a/code/modules/mob/living/simple_mob/appearance.dm b/code/modules/mob/living/simple_mob/appearance.dm
index 106c565a31..08b36da6fc 100644
--- a/code/modules/mob/living/simple_mob/appearance.dm
+++ b/code/modules/mob/living/simple_mob/appearance.dm
@@ -70,6 +70,8 @@
/mob/living/simple_mob/proc/remove_eyes()
cut_overlay(eye_layer)
+ qdel(eye_layer)
+ eye_layer = null
/mob/living/simple_mob/gib()
..(icon_gib,1,icon) // we need to specify where the gib animation is stored
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index 1d6d24d490..d3ba6eb0b8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -149,7 +149,7 @@
morphed = FALSE
if(!silent)
- visible_message("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!")
+ visible_message("[src] suddenly collapses in on itself, dissolving into a pile of flesh!")
form = null
name = initial(name)
@@ -189,7 +189,7 @@
/mob/living/simple_mob/vore/hostile/morph/death(gibbed)
if(morphed)
- visible_message("[src] twists and dissolves into a pile of green flesh!")
+ visible_message("[src] twists and dissolves into a pile of flesh!")
restore(TRUE)
..()
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 5f5a3bfe69..1b8c20e26c 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -1195,6 +1195,11 @@
icon_state = "hair_ziegler"
flags = HAIR_TIEABLE
+/datum/sprite_accessory/hair/zone
+ name = "Zone Braid"
+ icon_state = "hair_zone"
+ flags = HAIR_TIEABLE
+
/datum/sprite_accessory/hair/una_hood
name = "Cobra Hood"
icon = 'icons/mob/human_face_alt.dmi'
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index a237436974..5fbc8aa271 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -34,7 +34,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
"honk" = 'sound/items/bikehorn.ogg',
"SKREE" = 'sound/voice/shriek1.ogg',
// "holy" = 'sound/items/PDA/ambicha4-short.ogg',
- "xeno" = 'sound/voice/hiss1.ogg')
+ "xeno" = 'sound/voice/hiss1.ogg',
+ "dust" = 'sound/effects/supermatter.ogg',
+ "spark" = 'sound/effects/sparks4.ogg',
+ "rad" = 'sound/items/geiger/high1.ogg',
+ "servo" = 'sound/machines/rig/rigservo.ogg')
var/hidden = 0 // Is the PDA hidden from the PDA list?
var/touch_silent = 0 //If 1, no beeps on interacting.
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 89febfacbb..6ed457029b 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -147,6 +147,13 @@
inhibitors = list("fluorine" = 0.01)
result_amount = 1
+/decl/chemical_reaction/instant/nutridax
+ name = "Nutridax"
+ id = "nutridax"
+ result = "nutridax"
+ required_reagents = list("oxygen" = 1, "lipozine" = 1, "carbon" = 1)
+ result_amount = 3
+
///////////////////////////////////////////////////////////////////////////////////
/// Vore Drugs
diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm
index a2bf719e1a..4ed136ec9e 100644
--- a/code/modules/reagents/reagents/medicine_vr.dm
+++ b/code/modules/reagents/reagents/medicine_vr.dm
@@ -92,3 +92,40 @@
/datum/reagent/sleevingcure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.remove_a_modifier_of_type(/datum/modifier/resleeving_sickness)
M.remove_a_modifier_of_type(/datum/modifier/faux_resleeving_sickness)
+
+/datum/reagent/nutridax
+ name = "Nutridax"
+ id = "nutridax"
+ description = "A dieting aid that targets free-floating proteins and sugars."
+ taste_description = "bitterness"
+ reagent_state = SOLID
+ color = "#605048"
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/nutridax/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+ if(alien == IS_DIONA)
+ return
+ M.dizziness = 0
+ M.drowsyness = 0
+ M.eye_blurry = 0
+ M.SetConfused(0)
+ if(M.ingested)
+ for(var/datum/reagent/R in M.ingested.reagent_list)
+ if(istype(R, /datum/reagent/nutriment))
+ R.remove_self(removed * 30)
+ if(istype(R, /datum/reagent/drink))
+ R.remove_self(removed * 30)
+
+/datum/reagent/nutridax/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+ if(alien == IS_DIONA)
+ return
+ M.dizziness = 0
+ M.drowsyness = 0
+ M.eye_blurry = 0
+ M.SetConfused(0)
+ if(M.bloodstr)
+ for(var/datum/reagent/R in M.bloodstr.reagent_list)
+ if(istype(R, /datum/reagent/nutriment))
+ R.remove_self(removed * 20)
+ if(istype(R, /datum/reagent/drink))
+ R.remove_self(removed * 30)
diff --git a/icons/inventory/head/item_vr_fishing.dmi b/icons/inventory/head/item_vr_fishing.dmi
new file mode 100644
index 0000000000..4f1a875c26
Binary files /dev/null and b/icons/inventory/head/item_vr_fishing.dmi differ
diff --git a/icons/inventory/head/mob_vr_fishing.dmi b/icons/inventory/head/mob_vr_fishing.dmi
new file mode 100644
index 0000000000..d057a6fee0
Binary files /dev/null and b/icons/inventory/head/mob_vr_fishing.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 7d433c9f41..e48f502c43 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/human_face_m.dmi b/icons/mob/human_face_m.dmi
index 0fbb422fd3..92cafc9afa 100644
Binary files a/icons/mob/human_face_m.dmi and b/icons/mob/human_face_m.dmi differ
diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi
index edf9142d1f..43a56cbfb5 100644
Binary files a/icons/mob/items/lefthand_melee_vr.dmi and b/icons/mob/items/lefthand_melee_vr.dmi differ
diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi
index 6558ff4593..89942d6e2f 100644
Binary files a/icons/mob/items/righthand_melee_vr.dmi and b/icons/mob/items/righthand_melee_vr.dmi differ
diff --git a/icons/mob/modular_armor.dmi b/icons/mob/modular_armor.dmi
index b7965b2ca3..c816c9b1ce 100644
Binary files a/icons/mob/modular_armor.dmi and b/icons/mob/modular_armor.dmi differ
diff --git a/icons/obj/beekeeping.dmi b/icons/obj/beekeeping.dmi
index 0b09bf4751..ae5fd457e9 100644
Binary files a/icons/obj/beekeeping.dmi and b/icons/obj/beekeeping.dmi differ
diff --git a/icons/obj/landmark_vr.dmi b/icons/obj/landmark_vr.dmi
new file mode 100644
index 0000000000..709bcfcfde
Binary files /dev/null and b/icons/obj/landmark_vr.dmi differ
diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi
index b4fdfb9d5c..33d8a9f286 100644
Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ
diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm
index e2ef0578d2..dac7a905f8 100644
--- a/maps/expedition_vr/beach/beach.dmm
+++ b/maps/expedition_vr/beach/beach.dmm
@@ -500,6 +500,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{
@@ -1245,6 +1252,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)
"yz" = (
@@ -1385,6 +1396,14 @@
},
/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)
@@ -1527,6 +1546,13 @@
/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)
"Fm" = (
/obj/structure/cable{
d1 = 4;
@@ -5447,7 +5473,7 @@ Xd
Xd
Xd
Xd
-LQ
+gq
Xd
Xd
xy
@@ -10595,7 +10621,7 @@ zV
yf
as
ad
-as
+BC
yf
as
ad
@@ -15524,7 +15550,7 @@ lI
lI
Nv
Fm
-Nv
+Ff
lI
pP
lI
diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm
index eda19d994e..175934ba36 100644
--- a/maps/gateway_vr/eggnogtown.dmm
+++ b/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,
@@ -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
diff --git a/maps/gateway_vr/eggnogtownunderground.dmm b/maps/gateway_vr/eggnogtownunderground.dmm
index 7da812dcca..14c39d3f48 100644
--- a/maps/gateway_vr/eggnogtownunderground.dmm
+++ b/maps/gateway_vr/eggnogtownunderground.dmm
@@ -1,78 +1,58 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ab" = (
/turf/simulated/mineral/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ac" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ad" = (
/obj/machinery/light/small,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/hotspring)
"ae" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"af" = (
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ag" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ah" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ai" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"aj" = (
/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
@@ -81,8 +61,6 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/hotsprings)
@@ -91,8 +69,6 @@
dir = 4
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/hotsprings)
@@ -101,8 +77,6 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
@@ -111,24 +85,18 @@
dir = 8
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"ao" = (
/obj/random/mob/semirandom_mob_spawner/vore/hostile,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
"ap" = (
/obj/random/awayloot,
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 303.15
},
/area/gateway/eggnogtown/underground)
@@ -137,8 +105,6 @@
dir = 5
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
@@ -147,15 +113,11 @@
dir = 4
},
/turf/simulated/mineral/floor/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/underground)
"as" = (
/turf/simulated/mineral/ignore_cavegen{
- nitrogen = 82.1472;
- oxygen = 21.8366;
temperature = 258.15
},
/area/gateway/eggnogtown/vibeout)
@@ -687,6 +649,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
@@ -2536,7 +2507,7 @@ gA
gA
af
af
-af
+MG
cb
cb
cb
@@ -2544,7 +2515,7 @@ cb
cb
cb
cb
-af
+MG
af
af
gA
diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm
index ccf5fd4fe0..afc16589d3 100644
--- a/maps/gateway_vr/variable/arynthilake_a.dmm
+++ b/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
diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm
index a7e041b07f..bbba59342e 100644
--- a/maps/gateway_vr/variable/arynthilake_b.dmm
+++ b/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/right/brown{
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
diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm
index 7bb7359a33..b07c16fb64 100644
--- a/maps/gateway_vr/variable/honlethhighlands_a.dmm
+++ b/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/left/brown{
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
diff --git a/maps/gateway_vr/variable/honlethhighlands_b.dmm b/maps/gateway_vr/variable/honlethhighlands_b.dmm
index 9a62e9b846..c5d6bc7e8b 100644
--- a/maps/gateway_vr/variable/honlethhighlands_b.dmm
+++ b/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/left/brown{
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
diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm
index 4aa6d1cace..2a42bcc14f 100644
--- a/maps/gateway_vr/wildwest.dmm
+++ b/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)
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 59d89d7a42..31339143b6 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/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,
@@ -23309,7 +23324,7 @@ aa
lT
Re
Re
-XQ
+oi
XQ
XQ
jQ
@@ -28033,7 +28048,7 @@ aL
oE
iH
tS
-in
+lj
in
in
in
diff --git a/maps/om_adventure/pois/cabin1.dmm b/maps/om_adventure/pois/cabin1.dmm
index 289930ef77..419919404e 100644
--- a/maps/om_adventure/pois/cabin1.dmm
+++ b/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/left/brown{
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
"}
diff --git a/maps/om_adventure/pois/cabin2.dmm b/maps/om_adventure/pois/cabin2.dmm
index 005b5b3a1e..d0d13c3951 100644
--- a/maps/om_adventure/pois/cabin2.dmm
+++ b/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/right/brown{
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
diff --git a/maps/om_adventure/pois/camp.dmm b/maps/om_adventure/pois/camp.dmm
index 13960f3854..ced5709932 100644
--- a/maps/om_adventure/pois/camp.dmm
+++ b/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
diff --git a/maps/om_adventure/pois/medicalcenter.dmm b/maps/om_adventure/pois/medicalcenter.dmm
index c63fd95ef5..7130db01d9 100644
--- a/maps/om_adventure/pois/medicalcenter.dmm
+++ b/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/left/blue{
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
diff --git a/maps/om_adventure/pois/shippart1.dmm b/maps/om_adventure/pois/shippart1.dmm
index 7d2831eade..8fe8459aa2 100644
--- a/maps/om_adventure/pois/shippart1.dmm
+++ b/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
diff --git a/maps/om_adventure/pois/shuttlewreck2.dmm b/maps/om_adventure/pois/shuttlewreck2.dmm
index c741ee7055..50e8e0b483 100644
--- a/maps/om_adventure/pois/shuttlewreck2.dmm
+++ b/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" = (
diff --git a/maps/om_adventure/pois/shuttlewreck4.dmm b/maps/om_adventure/pois/shuttlewreck4.dmm
index 28fc4367d9..bde678213d 100644
--- a/maps/om_adventure/pois/shuttlewreck4.dmm
+++ b/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
diff --git a/maps/om_adventure/pois/woodentemple.dmm b/maps/om_adventure/pois/woodentemple.dmm
index 585cfc0a29..d12c7fa680 100644
--- a/maps/om_adventure/pois/woodentemple.dmm
+++ b/maps/om_adventure/pois/woodentemple.dmm
@@ -137,8 +137,16 @@
/turf/simulated/floor/wood,
/area/om_adventure/poi/woodentemple)
"W" = (
-/obj/trader/general{
- dir = 8
+/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)
@@ -226,7 +234,7 @@ C
j
d
A
-d
+X
m
N
Q
diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm
index d7bca2204d..6de916b0c1 100644
--- a/maps/stellardelight/ship_centcom.dmm
+++ b/maps/stellardelight/ship_centcom.dmm
@@ -576,6 +576,12 @@
"bF" = (
/turf/simulated/floor/reinforced,
/area/shuttle/centcom/ccbay)
+"bG" = (
+/obj/trader/general{
+ move_trader = 1
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/centcom/ccbay)
"bJ" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/box/pillbottles,
@@ -28602,7 +28608,7 @@ bS
fR
bY
lM
-Bx
+bG
Bx
Bx
Bx
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 94b58cab54..f81e75775d 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -9951,6 +9951,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" = (
@@ -10241,6 +10245,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,
@@ -27133,7 +27144,7 @@ NL
qy
NL
by
-KJ
+Li
KJ
le
ww
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index fd39fa6cc8..fdbd846032 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/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
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 3fbd8347dd..f9fd05e2ab 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -1182,7 +1182,7 @@
/area/tether/surfacebase/medical/patient_b)
"abH" = (
/obj/machinery/camera/network/medbay,
-/turf/simulated/open,
+/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/centralstairwell)
"abI" = (
/obj/structure/catwalk,
@@ -4399,7 +4399,7 @@
dir = 1;
pixel_y = -25
},
-/turf/simulated/open,
+/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/centralstairwell)
"agQ" = (
/obj/structure/disposalpipe/segment{
@@ -12427,16 +12427,13 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"atQ" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/public_garden_two)
+"atR" = (
/obj/structure/railing{
dir = 8
},
-/turf/simulated/open,
-/area/tether/surfacebase/security/middlehall)
-"atR" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/open,
+/turf/simulated/floor/plating,
/area/tether/surfacebase/security/middlehall)
"atS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23663,9 +23660,18 @@
},
/turf/simulated/open,
/area/rnd/staircase/secondfloor)
+"aPG" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/security/middlehall)
"aPH" = (
/turf/simulated/open,
/area/rnd/staircase/secondfloor)
+"aPI" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/north_staires_two)
"aPJ" = (
/turf/simulated/wall,
/area/rnd/breakroom)
@@ -23713,6 +23719,12 @@
},
/turf/simulated/floor/wood,
/area/rnd/breakroom)
+"aPQ" = (
+/turf/simulated/floor/plating,
+/area/rnd/staircase/secondfloor)
+"aPR" = (
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"aPS" = (
/obj/machinery/alarm{
dir = 8;
@@ -24010,6 +24022,18 @@
},
/turf/simulated/floor/wood,
/area/rnd/breakroom)
+"aQC" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
+"aQD" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"aQE" = (
/obj/structure/bed/chair{
dir = 4
@@ -24968,6 +24992,9 @@
/obj/random/maintenance/clean,
/turf/simulated/floor,
/area/maintenance/lower/south)
+"aSr" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/east_stairs_two)
"aSs" = (
/obj/structure/toilet,
/obj/machinery/light/small{
@@ -33356,6 +33383,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
@@ -33902,6 +33936,13 @@
/obj/item/weapon/grenade/anti_photon,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
+"opK" = (
+/obj/move_trader_landmark{
+ dir = 4;
+ trader_type = /obj/trader/general
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/rnd)
"oXH" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -38185,7 +38226,7 @@ adt
aac
arl
asq
-aab
+arl
aab
avh
aac
@@ -40454,7 +40495,7 @@ amd
ang
aog
apr
-aqx
+atQ
aqx
asu
atG
@@ -42729,7 +42770,7 @@ apE
ahn
arB
arB
-atQ
+atR
aus
avo
avT
@@ -42766,7 +42807,7 @@ aNv
aOk
aOY
aOY
-aPH
+aPQ
aPH
aRM
atA
@@ -42871,7 +42912,7 @@ apF
ahn
arB
arB
-atR
+aPG
aut
avp
avT
@@ -42908,7 +42949,7 @@ aIP
aOl
aPa
aqt
-aPH
+aPQ
aPH
aRM
atz
@@ -44733,7 +44774,7 @@ avD
aBJ
aCw
avD
-aEc
+opK
aED
aFi
aFT
@@ -45155,7 +45196,7 @@ ayW
azz
azz
azz
-azz
+aPI
aBM
aCz
ayW
@@ -45189,7 +45230,7 @@ aUv
aRZ
aVW
aWP
-aXB
+aPR
aXB
aYK
aXB
@@ -45297,7 +45338,7 @@ ayW
azz
azz
aAD
-azz
+aPI
aBN
aCA
ayW
@@ -45331,7 +45372,7 @@ aUw
aRZ
aVW
aWP
-aXC
+aQC
aXC
aXB
aXB
@@ -45505,7 +45546,7 @@ baz
bjs
bjs
bjs
-bjs
+baU
baU
baW
baW
@@ -45647,7 +45688,7 @@ baz
bjs
bjs
bjs
-bjs
+baU
baU
baW
baW
@@ -47035,7 +47076,7 @@ aUG
aSd
aWg
aXb
-aXJ
+aQD
aXJ
aXB
aXB
@@ -47177,7 +47218,7 @@ awe
aSd
aWg
aXb
-aXB
+aPR
aXB
aXB
aXB
@@ -48171,7 +48212,7 @@ adt
aNo
aWm
aWm
-aWm
+aSr
aYv
aYV
aZs
@@ -48313,7 +48354,7 @@ aNo
aNo
aWm
aWm
-aWm
+aSr
aYw
aYW
aZt
@@ -51188,7 +51229,7 @@ bkq
bkG
bgU
blk
-blG
+jSc
blT
bmb
abn
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index c4b28ec13a..3a8133e1c9 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -462,11 +462,10 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/storage)
"aaM" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/simulated/open,
-/area/tether/surfacebase/security/upperhall)
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/medical/uppernorthstairwell{
+ name = "\improper North Medical Stairwell"
+ })
"aaN" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -1837,7 +1836,7 @@
})
"acN" = (
/obj/structure/railing,
-/turf/simulated/open,
+/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/uppernorthstairwell{
name = "\improper North Medical Stairwell"
})
@@ -14452,6 +14451,12 @@
},
/turf/simulated/floor/tiled,
/area/rnd/research)
+"axF" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/security/upperhall)
"axG" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light{
@@ -17487,6 +17492,10 @@
/obj/effect/floor_decal/corner/lime/border,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/botanystorage)
+"aCl" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/security/upperhall)
"aCm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -17918,6 +17927,12 @@
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
+"aDa" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/medical/uppersouthstairwell)
"aDb" = (
/obj/structure/flora/ausbushes/fernybush,
/turf/simulated/floor/grass,
@@ -17945,6 +17960,9 @@
"aDg" = (
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_three)
+"aDh" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/public_garden_three)
"aDi" = (
/obj/structure/window/reinforced,
/obj/effect/floor_decal/steeldecal/steel_decals6{
@@ -18311,6 +18329,9 @@
/obj/machinery/vending/hydronutrients,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/botanystorage)
+"aDN" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/medical/uppersouthstairwell)
"aDO" = (
/obj/structure/bed/chair/wood,
/turf/simulated/floor/grass,
@@ -18943,6 +18964,9 @@
},
/turf/simulated/floor/carpet,
/area/library)
+"aEW" = (
+/turf/simulated/floor/plating/external/virgo3b,
+/area/tether/surfacebase/outside/outside3)
"aEX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/grass,
@@ -20058,6 +20082,12 @@
/obj/machinery/vending/cigarette,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/servicebackroom)
+"aGH" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/north_stairs_three)
"aGI" = (
/obj/machinery/vending/cola/soft,
/turf/simulated/floor/tiled,
@@ -22948,11 +22978,8 @@
/turf/simulated/open,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aLM" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/open,
-/area/rnd/outpost/xenobiology/outpost_stairs)
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/north_stairs_three)
"aLN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
@@ -23357,6 +23384,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/robotics/surgeryroom2)
+"aMA" = (
+/turf/simulated/floor/plating,
+/area/bridge_hallway)
"aMB" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
@@ -23604,6 +23634,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/shuttle_pad)
+"aMZ" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/bridge_hallway)
"aNa" = (
/obj/machinery/computer/shuttle_control/tether_backup{
req_one_access = list()
@@ -23704,6 +23740,12 @@
},
/turf/simulated/wall,
/area/tether/surfacebase/shuttle_pad)
+"aNk" = (
+/turf/simulated/floor/plating,
+/area/rnd/staircase/thirdfloor)
+"aNl" = (
+/turf/simulated/floor/plating,
+/area/hallway/lower/third_south)
"aNm" = (
/obj/structure/bed/chair/shuttle{
dir = 8
@@ -23803,6 +23845,9 @@
},
/turf/simulated/floor/bluegrid,
/area/rnd/robotics/mechbay)
+"aNx" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/southhall)
"aNy" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -23935,6 +23980,12 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
+"aNJ" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_stairs)
"aNK" = (
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "lifeboat1";
@@ -23989,11 +24040,7 @@
base_turf = /turf/simulated/floor/reinforced
})
"aNQ" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 24
- },
-/turf/simulated/open,
+/turf/simulated/floor/plating,
/area/rnd/outpost/xenobiology/outpost_stairs)
"aNR" = (
/obj/structure/catwalk,
@@ -24576,6 +24623,13 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/tether/surfacebase/shuttle_pad)
+"aPc" = (
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 24
+ },
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_stairs)
"aPd" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -25009,12 +25063,6 @@
},
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
-"aQd" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/open,
-/area/tether/surfacebase/north_stairs_three)
"aQe" = (
/obj/machinery/light_switch{
dir = 4;
@@ -44292,10 +44340,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
-"xXZ" = (
-/obj/structure/railing,
-/turf/simulated/open,
-/area/tether/surfacebase/security/upperhall)
"xZw" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -47819,7 +47863,7 @@ aac
adI
aem
aab
-aab
+aEW
agu
aac
aac
@@ -49662,7 +49706,7 @@ enD
akm
aDi
aDs
-aDs
+aDh
aUw
aVb
tqY
@@ -49889,7 +49933,7 @@ aJA
aSg
aLR
aOh
-aLM
+aNJ
aMl
aNR
aCO
@@ -50031,7 +50075,7 @@ aSe
bha
aSr
aBf
-aMl
+aNQ
aMl
aNR
aCO
@@ -50173,7 +50217,7 @@ aJD
aSs
aEs
aLQ
-aNQ
+aPc
aMl
aNR
aCO
@@ -51547,7 +51591,7 @@ apA
atV
ahh
auu
-auu
+aNk
axt
ayr
aBe
@@ -51689,7 +51733,7 @@ atp
atW
ahh
auu
-auu
+aNk
ayB
ayB
aBg
@@ -52919,8 +52963,8 @@ adq
aai
aai
adq
-aaM
-xXZ
+axF
+aCl
adR
aac
aac
@@ -54929,7 +54973,7 @@ akx
ald
alT
amD
-aQd
+aGH
ane
ane
ane
@@ -55071,7 +55115,7 @@ aWU
ale
alU
amE
-ane
+aLM
ane
ane
ane
@@ -56493,7 +56537,7 @@ aZi
awn
atI
aYP
-aYT
+aMA
aYT
alj
baj
@@ -56635,7 +56679,7 @@ aEj
awn
aOU
aYQ
-aYU
+aMZ
aYU
alj
aZG
@@ -57173,7 +57217,7 @@ adG
adG
adG
aag
-aaQ
+aaM
acN
afD
abx
@@ -58233,8 +58277,8 @@ beB
aHW
knU
aJn
-aAN
-aAN
+aNl
+aNl
aJn
aKU
aMF
@@ -58766,8 +58810,8 @@ aio
rXW
lXv
axX
-alY
-alY
+aqO
+aqO
agw
aqh
agw
@@ -59033,8 +59077,8 @@ adu
bnc
aej
agi
-aIR
-aLL
+aDa
+aDN
aPr
aSb
boe
@@ -59969,8 +60013,8 @@ aPs
vYr
faL
aPs
-bhI
-bhI
+aNx
+aNx
bhK
adG
aOF
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 5763640265..430e7154cd 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -2344,6 +2344,28 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/chamber)
+"adO" = (
+/obj/structure/table/glass,
+/obj/item/weapon/backup_implanter{
+ pixel_y = 9
+ },
+/obj/item/weapon/backup_implanter{
+ pixel_y = 2
+ },
+/obj/item/weapon/backup_implanter{
+ pixel_y = -5
+ },
+/obj/item/weapon/backup_implanter{
+ pixel_y = -12
+ },
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/white,
+/area/tether/station/dock_two)
"adQ" = (
/obj/machinery/computer/power_monitor{
dir = 4;
@@ -31357,29 +31379,6 @@
/obj/machinery/status_display/supply_display,
/turf/simulated/wall,
/area/quartermaster/office)
-"rIz" = (
-/obj/structure/table/glass,
-/obj/item/weapon/backup_implanter{
- pixel_y = 9
- },
-/obj/item/weapon/backup_implanter{
- pixel_y = 2
- },
-/obj/item/weapon/backup_implanter{
- pixel_y = -5
- },
-/obj/item/weapon/backup_implanter{
- pixel_y = -12
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 5
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 5
- },
-/turf/simulated/floor/tiled/white,
-/area/tether/station/dock_two)
"rIA" = (
/obj/machinery/light{
dir = 4
@@ -49450,7 +49449,7 @@ wbf
btr
fQr
fLT
-rIz
+adO
nRk
odT
fLT
diff --git a/vorestation.dme b/vorestation.dme
index 016b542c94..73c80f1abf 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2009,6 +2009,7 @@
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\gloves\miscellaneous_vr.dm"
#include "code\modules\clothing\head\collectable.dm"
+#include "code\modules\clothing\head\fishing.dm"
#include "code\modules\clothing\head\flowercrowns.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\helmet.dm"