Merge pull request #76 from Citadel-Station-13/master

Quick Update

code/__HELPERS/text.dm

@@ -273,7 +273,6 @@
 											"dont"="don't",
 											"shouldnt"="shouldn't",
 											" ive "=" I've ",
-											"whos"="who's",
 											"whove"="who've",
 											"whod"="who’d",
 											"whats"="what’s",

code/game/area/Off Station Areas.dm

@@ -587,7 +587,7 @@
 /area/lavaland/base/common
 	name = "Lava Land - Mining Base"
 	icon_state = "blue"
-	requires_power = 0
+	requires_power = 1
 /area/lavaland/explored
 	name = "Lava Land - Thoroughfare"
 	icon_state = "red"

code/game/jobs/job/special.dm

@@ -26,11 +26,12 @@
 			if(3) H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/pda/centcom(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle/M1911, slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud/all(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/pda/centcom(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud/all(H), slot_r_store)
 
 		H.implant_loyalty()
 
@@ -68,11 +69,13 @@
 			if(3) H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/pda/centcom(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle/M1911, slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/pda/centcom(H), slot_l_store)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/pda/centcom(H), slot_l_store)
+		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud(H), slot_r_store)
 
 		H.implant_loyalty()
 

code/game/objects/objs.dm

@@ -205,7 +205,7 @@
 		var/materials_list
 		var/i = 1
 		while(i<matter.len)
-			materials_list += matter[i]
+			materials_list += lowertext(matter[i])
 			materials_list += ", "
 			i++
 		materials_list += matter[i]

code/modules/client/client_procs.dm

@@ -1,3 +1,4 @@
+
 	////////////
 	//SECURITY//
 	////////////
@@ -76,6 +77,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 			to_chat(src, "<span class='danger'>Your previous action was ignored because you've done too many in a second</span>")
 			return
 
+	// Tgui Topic middleware.
+	if(tgui_Topic(href_list))
+		return
 
 	//Logs all hrefs, except chat pings
 	if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
@@ -90,10 +94,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		asset_cache_preload_data(href_list["asset_cache_preload_data"])
 		return
 
-	// Tgui Topic middleware.
-	if(tgui_Topic(href_list))
-		return
-
 	//Admin PM
 	if(href_list["priv_msg"])
 		var/client/C = locate(href_list["priv_msg"])

code/modules/maps/atmospheres/lavaland.dm

@@ -3,9 +3,9 @@
 	/datum/gas/oxygen = 0.22,
 	/datum/gas/nitrogen = 0.78
 	)
-	base_target_pressure = 110.1
-	minimum_pressure = 110.1
-	maximum_pressure = 110.1
+	base_target_pressure = 59.9
+	minimum_pressure = 59.9
+	maximum_pressure = 59.9
 	minimum_temp = 293.3
 	maximum_temp = 350.1
 

code/modules/mob/emote.dm

@@ -16,7 +16,7 @@
 		input = message
 	if(input)
 		log_emote(message,src) //Log before we add junk
-		message = "<B>[src]</B> [input]"
+		message = "<span class='emote'><B>[src]</B> [input]</span>"
 	else
 		return
 

code/modules/mob/living/carbon/human/examine.dm

@@ -335,9 +335,9 @@
 			. += "<span class='deadsay'>[T.He] [T.is] [ssd_msg].</span>"
 		//VOREStation Add Start
 		if(client && ((client.inactivity / 10) / 60 > 10)) //10 Minutes
-			. += "\[Inactive for [round((client.inactivity/10)/60)] minutes\]\n"
+			. += "\[Inactive for [round((client.inactivity/10)/60)] minutes\]"
 		else if(disconnect_time)
-			. += "\[Disconnected/ghosted [round(((world.realtime - disconnect_time)/10)/60)] minutes ago\]\n"
+			. += "\[Disconnected/ghosted [round(((world.realtime - disconnect_time)/10)/60)] minutes ago\]"
 		//VOREStation Add End
 
 	var/list/wound_flavor_text = list()
@@ -448,9 +448,9 @@
 
 	// VOREStation Start
 	if(ooc_notes)
-		. += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[src];ooc_notes=1'>\[View\]</a>\n"
+		. += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[src];ooc_notes=1'>\[View\]</a>"
 
-	. += "<span class='deptradio'><a href='?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a></span>\n"
+	. += "<span class='deptradio'><a href='?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a></span>"
 
 	// VOREStation End
 	. += "*---------*</span>"
@@ -488,7 +488,7 @@
 /mob/living/carbon/human/proc/examine_weight()
 	if(!show_pudge()) //Some clothing or equipment can hide this.
 		return null
-	var/message
+	var/message = FALSE
 	var/weight_examine = round(weight)
 	var/t_He 	= "It" //capitalised for use at the start of each line.
 	var/t_he	= "it"
@@ -531,31 +531,31 @@
 
 	switch(weight_examine)
 		if(0 to 74)
-			message = "<span class='warning'>[t_He] [t_is] terribly lithe and frail!</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] terribly lithe and frail!</span>"
 		if(75 to 99)
-			message = "[t_He] [t_has] a very slender frame.\n"
+			message = "[t_He] [t_has] a very slender frame."
 		if(100 to 124)
-			message = "[t_He] [t_has] a lightweight, athletic build.\n"
+			message = "[t_He] [t_has] a lightweight, athletic build."
 		if(125 to 174)
-			message = "[t_He] [t_has] a healthy, average body.\n"
+			message = "[t_He] [t_has] a healthy, average body."
 		if(175 to 224)
-			message = "[t_He] [t_has] a thick, [t_heavy] physique.\n"
+			message = "[t_He] [t_has] a thick, [t_heavy] physique."
 		if(225 to 274)
-			message = "[t_He] [t_has] a plush, chubby figure.\n"
+			message = "[t_He] [t_has] a plush, chubby figure."
 		if(275 to 325)
-			message = "[t_He] [t_has] an especially plump body with a round potbelly and large hips.\n"
+			message = "[t_He] [t_has] an especially plump body with a round potbelly and large hips."
 		if(325 to 374)
-			message = "[t_He] [t_has] a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.\n"
+			message = "[t_He] [t_has] a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs."
 		if(375 to 474)
-			message = "<span class='warning'>[t_He] [t_is] incredibly obese. [t_His] massive potbelly sags over [t_his] waistline while [t_his] fat ass would probably require two chairs to sit down comfortably!</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] incredibly obese. [t_His] massive potbelly sags over [t_his] waistline while [t_his] fat ass would probably require two chairs to sit down comfortably!</span>"
 		else
-			message += "<span class='warning'>[t_He] [t_is] so morbidly obese, you wonder how [t_he] can even stand, let alone waddle around the station. [t_He] can't get any fatter without being immobilized.</span>\n"
+			message += "<span class='warning'>[t_He] [t_is] so morbidly obese, you wonder how [t_he] can even stand, let alone waddle around the station. [t_He] can't get any fatter without being immobilized.</span>"
 	return message //Credit to Aronai for helping me actually get this working!
 
 /mob/living/carbon/human/proc/examine_nutrition()
 	if(!show_pudge()) //Some clothing or equipment can hide this.
 		return null
-	var/message
+	var/message = FALSE
 	var/nutrition_examine = round(nutrition)
 	var/t_He 	= "It" //capitalised for use at the start of each line.
 	var/t_His 	= "Its"
@@ -587,23 +587,23 @@
 			t_His 	= "Hir"
 	switch(nutrition_examine)
 		if(0 to 49)
-			message = "<span class='warning'>[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!</span>"
 		if(50 to 99)
-			message = "<span class='warning'>[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.</span>"
 		if(100 to 499)
-			return message //Well that's pretty normal, really.
+			return null //Well that's pretty normal, really.
 		if(500 to 999) // range that vampires hit nutrition wise, best to not have vore kink messages forced on them.
-			message = "[t_He] appears to be well-hydrated and invigorated.\n"
+			message = "[t_He] appears to be well-hydrated and invigorated."
 		if(1000 to 1399)
-			message = "[t_He] [t_has] a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight.\n"
+			message = "[t_He] [t_has] a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight."
 		if(1400 to 1934) // One person fully digested.
-			message = "<span class='warning'>[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.</span>"
 		if(1935 to 3004) // Two people.
-			message = "<span class='warning'>[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft.</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft.</span>"
 		if(3005 to 4074) // Three people.
-			message = "<span class='warning'>[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move.</span>\n"
+			message = "<span class='warning'>[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move.</span>"
 		if(4075 to INFINITY) // Four or more people.
-			message = "<span class='warning'>[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!</span>\n"
+			message = "<span class='warning'>[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!</span>"
 	return message
 
 //For OmniHUD records access for appropriate models
@@ -632,18 +632,21 @@
 /mob/living/carbon/human/proc/examine_pickup_size(mob/living/H)
 	var/message
 	if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
-		message = "<font color='blue'>They are small enough that you could easily pick them up!</font>\n"
-	return message
+		message = "<font color='blue'>They are small enough that you could easily pick them up!</font>"
+		return message
+	return FALSE
 
 /mob/living/carbon/human/proc/examine_step_size(mob/living/H)
 	var/message
 	if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.75)
-		message = "<font color='red'>They are small enough that you could easily trample them!</font>\n"
-	return message
+		message = "<font color='red'>They are small enough that you could easily trample them!</font>"
+		return message
+	else
+		return FALSE
 
 /mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H)
 	if(nif && nif.examine_msg) //If you have one set, anyway.
-		return "<span class='notice'>[nif.examine_msg]</span>\n"
+		return "<span class='notice'>[nif.examine_msg]</span>"
 
 /mob/living/carbon/human/proc/examine_chimera(mob/living/carbon/human/H)
 	var/t_He 	= "It" //capitalised for use at the start of each line.
@@ -676,10 +679,10 @@
 			t_his 	= "hir"
 	if(revive_ready == REVIVING_NOW || revive_ready == REVIVING_DONE)
 		if(stat == DEAD)
-			return "<span class='warning'>[t_His] body is twitching subtly.</span>\n"
+			return "<span class='warning'>[t_His] body is twitching subtly.</span>"
 		else
-			return "<span class='notice'>[t_He] [t_appear] to be in some sort of torpor.</span>\n"
+			return "<span class='notice'>[t_He] [t_appear] to be in some sort of torpor.</span>"
 	if(feral)
-		return "<span class='warning'>[t_He] [t_has] a crazed, wild look in [t_his] eyes!</span>\n"
+		return "<span class='warning'>[t_He] [t_has] a crazed, wild look in [t_his] eyes!</span>"
 	if(bitten)
-		return "<span class='notice'>[t_He] [t_appear] to have two fresh puncture marks on [t_his] neck.</span>\n"
+		return "<span class='notice'>[t_He] [t_appear] to have two fresh puncture marks on [t_his] neck.</span>"

code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm

@@ -49,4 +49,11 @@
 	supernatural = TRUE
 
 /mob/living/simple_mob/animal/space/bats/cult/cultify()
-	return
+	return
+
+//Lavaland Bats
+/mob/living/simple_mob/animal/space/bats/surt
+	name = "volcanic bat swarm"
+	desc = "A swarm of blood sucking bats that have adapted to exist on this volatile planet. They are extremely hostile."
+
+	heat_resist = 1

code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm

@@ -516,3 +516,14 @@
 /datum/ai_holder/simple_mob/ranged/aggressive/blood_hunter //This directs the AI to charge while shooting at its victim then entering Glorious melee combat.
 	pointblank = FALSE
 	closest_distance = 0
+
+////////////////////////////
+//		Ash Hunter
+////////////////////////////
+
+
+/mob/living/simple_mob/humanoid/cultist/hunter/surt // This Mob is not meant to be fair, he is not meant to fight regular crew he is to be pitted against heavily armed explo teams to see if he can wipe them out.
+	name = "Itinerant Blood Hunter"
+	desc = "This Blood Hunter is far from home. Strange energies course around him, protecting him from the environment. What eldritch influence drew him to this place?" // Blood Hunter on vacation.
+
+	heat_resist = 1 //Might make this 0.75 if 1 is too much resistance for a boss monster. This guy's just a placeholder until we get the Miner in anyways.

code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror/cyber_horror.dm

@@ -180,7 +180,7 @@
  //Slightly more durable fodder
 /mob/living/simple_mob/mechanical/cyber_horror/vox
 	name = "Vox shambles"
-	desc = "Once a Vox now torn and changed, peices of a Durand has been grafted onto it."
+	desc = "Once a Vox now torn and changed, peices of a Durand have been grafted onto it."
 	icon_state = "vox_cyber_horror"
 	icon_dead = "vox_cyber_horror_dead"
 
@@ -299,7 +299,7 @@
 //Direct Ranged Mob
 /mob/living/simple_mob/mechanical/cyber_horror/corgi
 	name = "Malformed Corgi"
-	desc = "Pieces of metal and technology is embedded in this Ian."
+	desc = "Pieces of metal and technology are embedded in this corgi."
 	icon_state = "corgi_cyber_horror"
 	icon_dead = "corgi_cyber_horror_dead"
 	maxHealth = 50
@@ -365,3 +365,75 @@
 	icon_state = "force_missile"
 	damage = 12
 	damage_type = BURN
+
+////////////////////////
+//Lavaland Cyber_Horrors
+////////////////////////
+
+/mob/living/simple_mob/mechanical/cyber_horror/surt
+	name = "ash coated remnant"
+	desc = "What was once a man, now twisted and warped by machine. A heavy layer of volcanic ash clings to what little organic portions remain."
+
+	heat_resist = 1
+
+/datum/say_list/cyber_horror/surt
+	speak = list("H@!#$$P M@!$#",
+				 "GHAA!@@#",
+				 "KR@!!N",
+				 "K!@@##L!@@ %!@#E",
+				 "G@#!$ H@!#%",
+				 "H!@%%@ @!E")
+	emote_hear = list("sparks!", "groans.", "wails.", "sobs.")
+	emote_see = list ("stares unblinkingly.", "jitters and twitches.", "emits a synthetic scream.", "rapidly twitches.", "convulses.", "twitches uncontrollably.", "goes stock still.")
+	say_threaten = list ("FR@#DOM","EN@ T#I$-$","N0$ M^> B@!#", "P#RF$*!T$ON")
+	say_got_target = list("I *#@ Y@%","!E@#$P","F#RR @I","D0@#$ ##OK %","IT $##TS")
+
+// Fragile but dangerous
+/mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror/surt
+	name = "obsidian-studded husk"
+	desc = "What was once a phoronoid, now a empty shell of malfunctioning nanites. Chunks of volcanic glass have been painfully grafted into the tissue."
+
+	heat_resist = 1
+
+// Mech Shredder
+/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror/surt
+	name = "grainy nanite abomination"
+	desc = "What was once something, now an exposed shell with lashing cables. Its form is mealy and inconsistent - it appears to have involuntarily incorporated the ash into its biology."
+
+	heat_resist = 1
+
+//Slightly more durable fodder
+/mob/living/simple_mob/mechanical/cyber_horror/vox/surt
+	name = "ragged shambler"
+	desc = "Once a Vox now torn and changed, peices of a Durand have been grafted onto it. This body seems fresher than the others - perhaps a recent convert."
+
+	heat_resist = 1
+
+ // Hit and run mob
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran/surt
+	name = "singed ash-stalker"
+	desc = "A mangled mess of machine and fur, light seems to bounce off it. Although it cannot be seen easily, at close ranges it smells strongly of burnt hair."
+
+	heat_resist = 1
+
+
+//Arcing Ranged Mob
+/mob/living/simple_mob/mechanical/cyber_horror/grey/surt
+	name = "exhumed deacon"
+	desc = "A mess of machine and organic, it's hard to even know what it was before. Strips of charred paper and hand-crafted religious icons have been draped over its body."
+
+	heat_resist = 1
+
+//Direct Ranged Mob
+/mob/living/simple_mob/mechanical/cyber_horror/corgi/surt
+	name = "matted tracker drone"
+	desc = "Pieces of metal and technology embedded in this corgi have turned it into a blank drone. Its fur is burned and matted down with soot and ash."
+
+	heat_resist = 1
+
+//Cats and mayhem
+/mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror/surt
+	name = "smoldering hunter drone"
+	desc = "This creature, formerly a cat, has had arachnid legs crudely grafted to its body. It moves with frightening acuity."
+
+	heat_resist = 1

code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm

@@ -46,4 +46,12 @@
 
 	ghostize()
 	qdel(src)
-	return
+	return
+
+//Lavaland Shades
+/mob/living/simple_mob/construct/shade/surt
+	name = "Lingering Shade"
+	real_name = "Lingering Shade"
+	desc = "This spirit was bound to this planet ages ago. Its masters have long since passed, and the war it served in has been forgotten. The energies binding it remain."
+
+	heat_resist = 1

code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm

@@ -132,3 +132,10 @@
 /datum/ai_holder/simple_mob/melee/evasive/corrupthound
 	violent_breakthrough = TRUE
 	can_breakthrough = TRUE
+
+//Lavaland Hound
+/mob/living/simple_mob/vore/aggressive/corrupthound/surt
+	name = "warped corrupt hound"
+	desc = "A remnant of a forgotten conflict. The harsh atmosphere has warped the plating on this hound. The slightest motion summons shrieks and squeals from its tortured machinery."
+
+	heat_resist = 1

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -4,9 +4,6 @@
 	icon = 'icons/obj/gun/energy.dmi'
 	icon_state = "kineticgun"
 	item_state = "kineticgun"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi')
 	projectile_type = /obj/item/projectile/kinetic
 	origin_tech = list(TECH_COMBAT = 3, TECH_POWER = 3, TECH_ENGINEERING = 3)
 	can_flashlight = TRUE
@@ -71,7 +68,7 @@
 	if(!isturf(proj_turf))
 		return
 	var/datum/gas_mixture/environment = proj_turf.return_air()
-	if(environment.temperature > 250)
+	if(environment.return_pressure() > 60)
 		BB.name = "weakened [BB.name]"
 		BB.damage *= BB.pressure_decrease
 	return BB

code/modules/projectiles/guns/energy/special.dm

@@ -297,10 +297,6 @@ obj/item/gun/energy/staff/focus
 	icon_state = "medbeam"
 	item_state = "medbeam"
 	icon = 'icons/obj/gun/energy.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi',
-		)
 	slot_flags = SLOT_BELT
 	accuracy = 100
 	fire_delay = 12

code/modules/projectiles/guns/energy/stun.dm

@@ -4,7 +4,7 @@
 	icon_state = "taser"
 	item_state = null	//so the human update icon uses the icon_state instead.
 	projectile_type = /obj/item/projectile/beam/stun
-	charge_cost = 160
+	charge_cost = 240
 	fire_delay = 4
 
 /obj/item/gun/energy/taser/mounted

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -71,11 +71,48 @@
 	name = "warden's shotgun"
 	desc = "A heavily modified Hephaestus Industries KS-40. This version bears multiple after-market mods, including a laser sight to help compensate for its shortened stock. 'Property of the Warden' has been etched into the side of the reciever. Uses 12g rounds."
 	icon_state = "shotgun_w"
-	item_state = "wshotgun"
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	w_class = ITEMSIZE_NORMAL
 	ammo_type = /obj/item/ammo_casing/a12g/beanbag
 
+obj/item/gun/projectile/shotgun/pump/combat/warden/verb/rename_gun()
+	set name = "Name Gun"
+	set category = "Object"
+	set desc = "Rename your gun. If you're the Warden."
+
+	var/mob/M = usr
+	if(!M.mind)	return 0
+	var/job = M.mind.assigned_role
+	if(job != "Warden")
+		to_chat(M, "<span class='notice'>You don't feel cool enough to name this gun.</span>")
+		return 0
+
+	var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
+
+	if(src && input && !M.stat && in_range(M,src))
+		name = input
+		to_chat(M, "You name the gun [input]. Lock and load.")
+		return 1
+
+/obj/item/gun/projectile/shotgun/pump/combat/warden/verb/reskin_gun()
+	set name = "Resprite gun"
+	set category = "Object"
+	set desc = "Click to choose a sprite for your gun."
+
+	var/mob/M = usr
+	var/list/options = list()
+	options["KS-40 CQC"] = "shotgun_w"
+	options["NT Limted Run CQ-6"] = "shotgun_w_corp"
+	options["WT Sabot Stinger"] = "shotgun_w_sting"
+	options["Donksoft Prank Kit"] = "shotgun_w_donk"
+	var/choice = input(M,"Choose your sprite!","Resprite Gun") in options
+	if(src && choice && !M.stat && in_range(M,src))
+		icon_state = options[choice]
+		item_state = options[choice]
+		to_chat(M, "Your gun is now sprited as [choice]. Lock and load.")
+		update_icon()
+		return 1
+
 /obj/item/gun/projectile/shotgun/doublebarrel
 	name = "double-barreled shotgun"
 	desc = "A truely classic weapon. No need to change what works. Uses 12g rounds."

code/modules/vore/fluffstuff/custom_guns.dm

@@ -721,7 +721,6 @@ END OF CITADEL CHANGES */
 	desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization."
 	icon_state = "phaser"
 	item_state = "phaser"
-	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi')
 	item_state_slots = list(slot_r_hand_str = "phaser", slot_l_hand_str = "phaser", "slot_belt" = "phaser")
 	fire_sound = 'sound/weapons/laser_rifle_1.wav'
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4)

html/changelog.html

@@ -256,15 +256,6 @@
 				<li class="rscadd">cloakglowing and cloakglowingdark accessory items</li>
 				<li class="rscadd">Civilian Cloak - Glowing Light and Civilian Cloak - Glowing Dark as loadout selections</li>
 			</ul>
-
-			<h2 class="date">18 December 2020</h2>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Destructive analyzers now return material to their lathes properly.</li>
-				<li class="tweak">RPEDs now drop lowest part tier when used inhand.</li>
-				<li class="tweak">RPEDs can be clickdragged onto destructive analyzers to recycle lowest part tier.</li>
-				<li class="tweak">Protolathes and autolathes are now less awful to look at.</li>
-			</ul>
 		</div>
 
 <br><b>Baystation 12 Credit List</b>

html/changelogs/AutoChangeLog-pr-2729.yml

@@ -0,0 +1,7 @@
+author: "lolman360"
+delete-after: True
+changes: 
+  - bugfix: "emotes are no longer in tguichat  unsorted tab"
+  - bugfix: "materials on examine are no longer caps always"
+  - bugfix: "crew monitor console map view"
+  - bugfix: "human examine spacing (hopefully)"

html/changelogs/AutoChangeLog-pr-2734.yml

@@ -0,0 +1,4 @@
+author: "lolman360"
+delete-after: True
+changes: 
+  - tweak: "kpas now pressure dependent, 60 kpa"

maps/nsv_triumph/submaps/lavaland/botany.dmm

@@ -1,38 +1,382 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"c" = (/obj/machinery/seed_storage/xenobotany,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"f" = (/obj/effect/decal/remains,/obj/item/clothing/under/rank/hydroponics,/obj/item/clothing/suit/storage/toggle/labcoat/green,/obj/item/clothing/head/greenbandana,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"m" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/outdoors/grass,/area/lavaland/idleruins)
-"n" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"q" = (/obj/structure/bed/roller,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"r" = (/obj/machinery/seed_extractor,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"A" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"B" = (/obj/machinery/botany/editor,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"F" = (/obj/structure/reagent_dispensers/watertank/high,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"H" = (/obj/item/reagent_containers/spray/chemsprayer,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"I" = (/turf/template_noop,/area/lavaland/idleruins)
-"M" = (/turf/simulated/mineral/floor/cave,/area/lavaland/idleruins)
-"N" = (/turf/simulated/wall/wood,/area/lavaland/idleruins)
-"P" = (/obj/item/reagent_containers/spray/plantbgone,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"U" = (/obj/item/seeds/killertomatoseed,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"W" = (/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"X" = (/obj/structure/table/rack,/obj/item/shovel/spade,/obj/item/shovel/spade,/obj/item/material/minihoe,/obj/item/material/minihoe,/obj/item/material/knife/machete/hatchet,/obj/item/material/knife/machete/hatchet,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/analyzer/plant_analyzer,/obj/item/analyzer/plant_analyzer,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
-"Y" = (/turf/simulated/floor/outdoors/lavaland,/area/template_noop)
-"Z" = (/obj/machinery/botany/extractor,/turf/simulated/floor/tiled,/area/lavaland/idleruins)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/girder,
+/turf/simulated/floor,
+/area/lavaland/idleruins)
+"c" = (
+/obj/machinery/seed_storage/xenobotany,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"f" = (
+/obj/effect/decal/remains,
+/obj/item/clothing/under/rank/hydroponics,
+/obj/item/clothing/suit/storage/toggle/labcoat/green,
+/obj/item/clothing/head/greenbandana,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"g" = (
+/obj/structure/table/woodentable,
+/obj/item/paper/crumpled{
+	desc = "oil streaked note";
+	info = "Them bastards went and finally cracked 'er up, jus like I've been sayin' they would. Well t' hell with all of 'em. That girl Ariel stopped by earlier, tellin' me the survivors are tryin' to band together at th' Town Hall. Well those fools are gonna need food if they want to last more'n a day. So what does that leave me to do but stay here? Damn fools, the lot of 'em. I've got sturdy walls and plenty of soil. They can starve, like they deserve."
+	},
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"k" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"m" = (
+/obj/machinery/portable_atmospherics/hydroponics/soil,
+/turf/simulated/floor/outdoors/dirt,
+/area/lavaland/idleruins)
+"n" = (
+/obj/machinery/vending/hydronutrients,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"q" = (
+/obj/structure/bed/roller,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"r" = (
+/obj/machinery/seed_extractor,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"u" = (
+/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror/surt,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"v" = (
+/obj/structure/barricade,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"A" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"B" = (
+/obj/machinery/botany/editor,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"F" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"H" = (
+/obj/item/reagent_containers/spray/chemsprayer,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"I" = (
+/turf/template_noop,
+/area/lavaland/idleruins)
+"M" = (
+/turf/simulated/mineral/floor/cave,
+/area/lavaland/idleruins)
+"N" = (
+/turf/simulated/wall/wood,
+/area/lavaland/idleruins)
+"P" = (
+/obj/item/reagent_containers/spray/plantbgone,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"Q" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"R" = (
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/structure/table/woodentable,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"S" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/material/knife/machete/hatchet,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"U" = (
+/obj/item/seeds/killertomatoseed,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"W" = (
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"X" = (
+/obj/structure/table/rack,
+/obj/item/shovel/spade,
+/obj/item/shovel/spade,
+/obj/item/material/minihoe,
+/obj/item/material/minihoe,
+/obj/item/material/knife/machete/hatchet,
+/obj/item/material/knife/machete/hatchet,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/analyzer/plant_analyzer,
+/obj/item/analyzer/plant_analyzer,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
+"Y" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/template_noop)
+"Z" = (
+/obj/machinery/botany/extractor,
+/turf/simulated/floor/tiled,
+/area/lavaland/idleruins)
 
 (1,1,1) = {"
-aaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaa
-aAAAIIIIIIAAAAY
-aANNNNNNNNNNNAY
-aINmqBnrcZPmNAa
-aINmUWWWWPHmNIa
-aINmWWWFWWfmNIa
-aINmWWWXWWWmNIa
-aANmWWWWWWWmNAY
-aANmWWWWWWUmNAY
-aANNNNNWNNNNNAa
-aAAAANWWWNAAAAa
-aIAAAAAAAAAAAIa
-aIAAAAAAAAAAMIa
-aaaaaaaaaaaaaaa
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+A
+A
+I
+I
+I
+I
+A
+A
+A
+A
+I
+I
+a
+"}
+(3,1,1) = {"
+a
+a
+A
+N
+N
+N
+N
+N
+N
+N
+N
+A
+A
+A
+a
+"}
+(4,1,1) = {"
+a
+a
+A
+N
+m
+m
+m
+m
+m
+m
+N
+A
+A
+A
+a
+"}
+(5,1,1) = {"
+a
+a
+I
+N
+F
+U
+W
+W
+W
+W
+N
+A
+A
+A
+a
+"}
+(6,1,1) = {"
+a
+a
+I
+N
+B
+W
+W
+W
+W
+X
+N
+N
+A
+A
+a
+"}
+(7,1,1) = {"
+a
+a
+I
+N
+n
+W
+W
+W
+k
+W
+N
+W
+A
+A
+a
+"}
+(8,1,1) = {"
+a
+a
+I
+N
+r
+W
+W
+q
+k
+W
+v
+W
+A
+A
+a
+"}
+(9,1,1) = {"
+a
+a
+I
+N
+c
+W
+W
+Q
+g
+v
+N
+W
+A
+A
+a
+"}
+(10,1,1) = {"
+a
+a
+I
+N
+Z
+P
+S
+W
+W
+W
+N
+N
+A
+A
+a
+"}
+(11,1,1) = {"
+a
+a
+A
+b
+R
+H
+f
+u
+W
+U
+N
+A
+A
+A
+a
+"}
+(12,1,1) = {"
+a
+a
+A
+N
+m
+m
+m
+m
+m
+m
+N
+A
+A
+A
+a
+"}
+(13,1,1) = {"
+a
+a
+A
+N
+N
+N
+N
+N
+N
+N
+N
+A
+A
+M
+a
+"}
+(14,1,1) = {"
+a
+a
+A
+A
+A
+I
+I
+I
+A
+A
+A
+A
+I
+I
+a
+"}
+(15,1,1) = {"
+a
+a
+Y
+Y
+a
+a
+a
+a
+Y
+Y
+a
+a
+a
+a
+a
 "}

maps/nsv_triumph/submaps/lavaland/dogs.dmm

@@ -1,24 +1,301 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"k" = (/obj/structure/catwalk,/obj/structure/closet/crate,/obj/random/multiple/treasure,/turf/simulated/floor/outdoors/lava,/area/lavaland/bosses)
-"m" = (/obj/structure/catwalk,/turf/simulated/floor/outdoors/lava,/area/lavaland/bosses)
-"B" = (/mob/living/simple_mob/vore/aggressive/corrupthound,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/bosses)
-"U" = (/turf/simulated/floor/outdoors/lava,/area/lavaland/bosses)
-"Z" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/bosses)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"k" = (
+/obj/structure/catwalk,
+/obj/structure/closet/crate,
+/obj/random/multiple/treasure,
+/obj/item/bone/skull,
+/turf/simulated/floor/outdoors/lava,
+/area/lavaland/bosses)
+"m" = (
+/obj/structure/catwalk,
+/turf/simulated/floor/outdoors/lava,
+/area/lavaland/bosses)
+"B" = (
+/mob/living/simple_mob/vore/aggressive/corrupthound/surt,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"D" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"I" = (
+/obj/effect/decal/remains/posi,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"O" = (
+/obj/effect/decal/remains/unathi,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"T" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"U" = (
+/turf/simulated/floor/outdoors/lava,
+/area/lavaland/bosses)
+"X" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
+"Z" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/bosses)
 
 (1,1,1) = {"
-aaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaa
-aaUUUUUUUUUUUaa
-aaUZZZZUZZZZUaa
-aaUZZBZUZZBZUaa
-aaUZZZZkZZZZUaa
-aaUZZZZUZZZZUaa
-aaUUmUUUUUmUUaa
-aaUZZZZUZZZZUaa
-aaUZBZZUZZZZUaa
-aaUZZZZmZZZZmaa
-aaUZZZZUZZZZUaa
-aaUUUUUUUUUUUaa
-aaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaa
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+U
+Z
+Z
+X
+Z
+U
+Z
+Z
+Z
+Z
+U
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+U
+Z
+Z
+T
+Z
+m
+Z
+B
+Z
+I
+U
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+U
+Z
+B
+Z
+Z
+U
+Z
+Z
+Z
+Z
+U
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+U
+Z
+Z
+Z
+Z
+U
+Z
+Z
+Z
+Z
+U
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+U
+U
+U
+k
+U
+U
+U
+U
+m
+U
+U
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+U
+Z
+Z
+Z
+Z
+U
+D
+Z
+Z
+Z
+U
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+U
+Z
+O
+Z
+Z
+U
+Z
+X
+Z
+Z
+U
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+U
+Z
+B
+Z
+Z
+m
+Z
+Z
+Z
+Z
+U
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+U
+Z
+Z
+Z
+Z
+U
+Z
+Z
+Z
+Z
+U
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+U
+U
+U
+U
+U
+U
+U
+U
+m
+U
+U
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 "}

maps/nsv_triumph/submaps/lavaland/horrors.dmm

@@ -1,28 +1,353 @@
-"m" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"o" = (/obj/effect/decal/cleanable/blood/gibs,/obj/structure/table/bench/sifwooden/padded,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"p" = (/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"u" = (/turf/template_noop,/area/template_noop)
-"x" = (/obj/structure/statue/gold/rd,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"M" = (/turf/simulated/floor/outdoors/lavaland,/area/template_noop)
-"N" = (/turf/template_noop,/area/lavaland/horrors)
-"S" = (/obj/item/flame/candle/candelabra/everburn,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"Y" = (/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood,/obj/structure/table/bench/sifwooden/padded,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
-"Z" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/horrors)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/table/woodentable,
+/obj/item/flame/candle/candelabra/everburn,
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"c" = (
+/obj/structure/table/woodentable,
+/obj/item/book{
+	dat = The majority of the text has faded or been defaced. Several snippets of prayers are legible, but not enough to determine their intent. The phrases 'Great Designer', 'change', and 'flesh' appear repeatedly.;
+	name = "Tenets of The Great Designer"
+	},
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"i" = (
+/obj/structure/girder,
+/turf/simulated/floor,
+/area/lavaland/horrors)
+"k" = (
+/turf/simulated/wall/r_wall,
+/area/lavaland/horrors)
+"m" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/horrors)
+"o" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/structure/table/bench/sifwooden/padded,
+/turf/simulated/floor/bmarble,
+/area/lavaland/horrors)
+"q" = (
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran/surt,
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"u" = (
+/turf/template_noop,
+/area/template_noop)
+"v" = (
+/obj/structure/girder/displaced,
+/turf/simulated/floor,
+/area/lavaland/horrors)
+"x" = (
+/obj/structure/statue/gold/rd,
+/turf/simulated/floor/bmarble,
+/area/lavaland/horrors)
+"y" = (
+/obj/effect/floor_decal/asteroid,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/horrors)
+"A" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor,
+/area/lavaland/horrors)
+"E" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"I" = (
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"M" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/template_noop)
+"N" = (
+/turf/template_noop,
+/area/lavaland/horrors)
+"O" = (
+/obj/item/flame/candle/candelabra/everburn,
+/obj/structure/table/woodentable,
+/turf/simulated/floor/bmarble,
+/area/lavaland/horrors)
+"P" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wmarble,
+/area/lavaland/horrors)
+"U" = (
+/obj/structure/table,
+/obj/item/flame/candle/candelabra,
+/turf/simulated/floor,
+/area/lavaland/horrors)
+"V" = (
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/horrors)
+"X" = (
+/turf/simulated/floor,
+/area/lavaland/horrors)
+"Y" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/effect/decal/cleanable/blood,
+/obj/structure/table/bench/sifwooden/padded,
+/turf/simulated/floor/bmarble,
+/area/lavaland/horrors)
+"Z" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/horrors)
 
 (1,1,1) = {"
-uuuuuuuuuuuuuuu
-NNZZNNuMuuuuuuu
-NZZmZZZZZNNNNuu
-NNZZZZZxZZmZNuu
-NNZZZZZpZZZZNuu
-uNZZZYoSooZZZuu
-uuZZZZZZZZZZZMu
-uMZZZooSYoZZZMu
-uuZZZZZZZZZmZMu
-uMZZZYoSooZZZMu
-uMmZZZZZZZZZZMu
-uuNNNZZZZZZZZMu
-uuNNNNNZNNZZZMu
-uuuuuuuuuuuuuMu
-uuuuuuuuuuuuuuu
+u
+N
+N
+N
+N
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+"}
+(2,1,1) = {"
+u
+N
+Z
+N
+N
+N
+u
+M
+u
+M
+M
+u
+u
+u
+u
+"}
+(3,1,1) = {"
+u
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+m
+N
+N
+u
+u
+"}
+(4,1,1) = {"
+u
+Z
+m
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+N
+N
+u
+u
+"}
+(5,1,1) = {"
+u
+N
+Z
+k
+k
+k
+k
+y
+X
+i
+V
+N
+N
+u
+u
+"}
+(6,1,1) = {"
+u
+N
+k
+k
+E
+Y
+I
+o
+I
+Y
+U
+y
+N
+u
+u
+"}
+(7,1,1) = {"
+u
+u
+k
+O
+q
+o
+I
+o
+I
+o
+I
+k
+N
+u
+u
+"}
+(8,1,1) = {"
+u
+M
+k
+x
+I
+I
+I
+I
+I
+I
+I
+Z
+Z
+u
+u
+"}
+(9,1,1) = {"
+u
+u
+k
+O
+I
+o
+P
+Y
+I
+o
+I
+X
+N
+u
+u
+"}
+(10,1,1) = {"
+u
+u
+N
+k
+c
+o
+I
+o
+I
+o
+a
+k
+N
+u
+u
+"}
+(11,1,1) = {"
+u
+u
+N
+A
+k
+k
+v
+X
+k
+k
+k
+k
+Z
+u
+u
+"}
+(12,1,1) = {"
+u
+u
+N
+Z
+Z
+Z
+V
+Z
+m
+Z
+Z
+Z
+Z
+u
+u
+"}
+(13,1,1) = {"
+u
+u
+N
+N
+N
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+u
+u
+"}
+(14,1,1) = {"
+u
+u
+u
+u
+u
+u
+M
+M
+M
+M
+M
+M
+M
+M
+u
+"}
+(15,1,1) = {"
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
 "}

maps/nsv_triumph/submaps/lavaland/idleruins1.dmm

@@ -1,30 +1,340 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"d" = (/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"l" = (/obj/item/paper/crumpled/bloody{info = "KEEP YOUR EYES CLOSED\n\nDONT LOOK\nGODS SAVE US\nDONT LOOK\nSTRONGER WHEN YOU LOOK AT IT\nDONT LOOK\nDONT LOOK\nPOWER\nDONT LOOK AT IT\nDONT LOOK\nDONT LOOK\nBEAR WITNESS\n\nI CAN FEEL IT IN MY HEAD\n\nDONT LOOK\nEYES NEVER SHUT\n\nPS.\nGODS SAVE US\nDONT LOOK AT IT\nIT SEES YOU\nKEEP YOUR EYES CLOSED DONT LOOK\nDONT LOOK\nDONT LOOK\nDONT LOOK\nDONT LOOK"; name = "DONT LOOK"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"v" = (/obj/effect/floor_decal/asteroid,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"w" = (/turf/simulated/wall/wood,/area/lavaland/idleruins)
-"x" = (/obj/item/bone,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"y" = (/obj/item/bone,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"E" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"I" = (/obj/structure/barricade,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"N" = (/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"P" = (/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"T" = (/obj/effect/decal/cleanable/blood/gibs,/turf/simulated/floor/wood,/area/lavaland/idleruins)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"c" = (
+/obj/structure/table/bench/wooden,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"d" = (
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"j" = (
+/mob/living/simple_mob/mechanical/cyber_horror/corgi/surt,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"k" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/structure/table/bench/wooden,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"l" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"q" = (
+/obj/structure/trash_pile,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"t" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"v" = (
+/obj/effect/floor_decal/asteroid,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"w" = (
+/turf/simulated/wall/wood,
+/area/lavaland/idleruins)
+"x" = (
+/obj/item/bone,
+/obj/effect/decal/cleanable/blood,
+/obj/item/material/shard/shrapnel,
+/obj/structure/table,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"y" = (
+/obj/item/bone,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"D" = (
+/mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror/surt,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"E" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"H" = (
+/obj/structure/table/woodentable,
+/obj/item/paper/crumpled/bloody{
+	info = "Jacob stayed behind at the shelter, so I know he'll be okay. We've been bunkered down for days now. The seismic activity is getting worse, but the barricades are holding. They're adapting, we think. Someone says they saw a cat, probably from the colony. Sick bastards. We're talking about trying to move out for the shuttles at first light. Jacob, if you're reading this, meet me there. I love you. -A";
+	name = "weathered note"
+	},
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"I" = (
+/obj/structure/barricade,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"N" = (
+/obj/structure/loot_pile/surface/bones,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"P" = (
+/obj/structure/loot_pile/surface/bones,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"T" = (
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
 
 (1,1,1) = {"
-aaaaaaaaaaaaaaa
-aEEEaaaaaEEaaaa
-aEEEaaaaaEEEEaa
-aEEEEEEEEEEEEEa
-aEwwwwwwwvwwwwa
-aEwdddddPvEEdwa
-aEIddTdddyEdNwa
-aEIdddddTdddlwa
-aEwddddddddxdwa
-aEwwwwwwwwwwwwa
-aEEEEEEEEEEEEEa
-aEEEEEEEaaEEEEa
-aaaaEEEaaaEEEEa
-aaaaEEEaaaEEEaa
-aaaaaaaaaaaaaaa
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+E
+E
+D
+w
+w
+I
+I
+I
+w
+w
+E
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+E
+E
+E
+w
+t
+q
+q
+q
+t
+w
+E
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+E
+w
+d
+d
+d
+d
+d
+w
+E
+E
+E
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+E
+w
+c
+k
+d
+c
+c
+w
+E
+E
+E
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+E
+w
+d
+d
+d
+d
+d
+w
+E
+E
+E
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+E
+w
+c
+c
+j
+c
+c
+w
+E
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+E
+w
+P
+d
+T
+d
+d
+w
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+E
+E
+E
+v
+v
+y
+d
+c
+c
+w
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+E
+E
+E
+w
+E
+E
+d
+d
+d
+w
+E
+E
+E
+a
+"}
+(12,1,1) = {"
+a
+a
+E
+E
+w
+E
+t
+H
+x
+t
+w
+E
+E
+E
+a
+"}
+(13,1,1) = {"
+a
+a
+E
+E
+w
+d
+N
+l
+d
+d
+w
+E
+E
+E
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+E
+w
+w
+w
+w
+w
+w
+w
+E
+E
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 "}

maps/nsv_triumph/submaps/lavaland/idleruins2.dmm

@@ -1,57 +1,473 @@
-"gJ" = (/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"hd" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"hv" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"jd" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"nr" = (/obj/structure/frame,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"or" = (/turf/template_noop,/area/template_noop)
-"oN" = (/obj/item/material/shard/shrapnel,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"qO" = (/obj/structure/table/standard,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"ri" = (/obj/structure/table/rack,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"rw" = (/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"sI" = (/obj/item/material/shard/shrapnel,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"uc" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"uO" = (/obj/effect/decal/cleanable/dirt,/obj/random/firstaid,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"wX" = (/obj/structure/dispenser/oxygen{oxygentanks = 7},/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"xU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"yQ" = (/mob/living/bot/medbot{name = "Dr. Crusty"},/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"zE" = (/obj/effect/decal/cleanable/dirt,/obj/structure/frame,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"DM" = (/obj/structure/table/standard,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/viral,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"EJ" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"IO" = (/obj/structure/closet/secure_closet/medical3{name = "medical locker"; req_access = list()},/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"KO" = (/obj/structure/closet/secure_closet/sar{name = "sar locker"; req_access = list()},/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"Mo" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"Of" = (/obj/effect/decal/cleanable/dirt,/obj/item/material/shard/shrapnel,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"Oo" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
-"Qp" = (/obj/structure/frame/computer{dir = 1},/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"Qu" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"Re" = (/turf/template_noop,/area/lavaland/idleruins)
-"Sk" = (/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"Uo" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"VZ" = (/turf/simulated/shuttle/wall/hard_corner,/area/lavaland/idleruins)
-"Wd" = (/obj/effect/decal/cleanable/dirt,/obj/item/stack/material/steel,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"WH" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"WM" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/remains/posi,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"Xu" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"XA" = (/obj/effect/decal/cleanable/dirt,/obj/item/storage/firstaid/adv,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"Yt" = (/obj/machinery/suit_cycler/medical,/turf/simulated/shuttle/floor,/area/lavaland/idleruins)
-"YZ" = (/turf/simulated/shuttle/wall,/area/lavaland/idleruins)
-"Zb" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/lavaland/idleruins)
-"ZP" = (/obj/effect/decal/cleanable/dirt,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/lavaland/idleruins)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"cY" = (
+/obj/structure/closet/secure_closet/sar{
+	name = "sar locker";
+	req_access = list()
+	},
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"gJ" = (
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"hd" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"hv" = (
+/obj/structure/shuttle/window,
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"hH" = (
+/obj/structure/table/rack,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"jd" = (
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"nr" = (
+/obj/structure/frame,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"or" = (
+/turf/template_noop,
+/area/template_noop)
+"oN" = (
+/obj/item/material/shard/shrapnel,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"qO" = (
+/obj/structure/table/standard,
+/obj/random/unidentified_medicine/fresh_medicine,
+/obj/random/unidentified_medicine/fresh_medicine,
+/obj/random/unidentified_medicine/old_medicine,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"ri" = (
+/obj/structure/table/rack,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"rw" = (
+/obj/item/stack/material/steel,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"rG" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"sI" = (
+/obj/item/material/shard/shrapnel,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"uc" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"uO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/random/firstaid,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"wX" = (
+/obj/structure/dispenser/oxygen{
+	oxygentanks = 7
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"xU" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"yQ" = (
+/mob/living/bot/medbot{
+	name = "Dr. Crusty"
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"zE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/frame,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"Cr" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"DM" = (
+/obj/random/unidentified_medicine/fresh_medicine,
+/obj/random/unidentified_medicine/fresh_medicine,
+/obj/random/unidentified_medicine/viral,
+/obj/structure/table,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"EJ" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"IJ" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"IO" = (
+/obj/structure/closet/secure_closet/medical3{
+	name = "medical locker";
+	req_access = list()
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"IX" = (
+/mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror/surt,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"KO" = (
+/obj/structure/closet/secure_closet/sar{
+	name = "sar locker";
+	req_access = list()
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"Mo" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"Of" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/material/shard/shrapnel,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"Oo" = (
+/obj/item/stack/rods,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"Qp" = (
+/obj/structure/frame/computer{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"Qu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/molten_item,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"Qv" = (
+/obj/structure/ghost_pod/manual/human{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"Re" = (
+/turf/template_noop,
+/area/lavaland/idleruins)
+"Sk" = (
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"Uo" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"VZ" = (
+/turf/simulated/shuttle/wall/hard_corner,
+/area/lavaland/idleruins)
+"Wd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/material/steel,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"WH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"WM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/remains/posi,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"Xu" = (
+/obj/machinery/door/unpowered/shuttle,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"XA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/firstaid/adv,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"Yt" = (
+/obj/machinery/suit_cycler/medical,
+/turf/simulated/shuttle/floor,
+/area/lavaland/idleruins)
+"YZ" = (
+/turf/simulated/shuttle/wall,
+/area/lavaland/idleruins)
+"Zb" = (
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"ZP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/rods,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
 
 (1,1,1) = {"
-ororororororororororororororor
-ororororororororororororororor
-ororororororororororororororor
-orReReYZYZYZYZYZhvhvYZYZYZoror
-orReRejdzEYZnrSkyQSkKOYZUooror
-orReReoNxUYZqOSkgJSkKOYZUooror
-orRerwucuOYZDMgJgJSkIOYZUooror
-orReOoQuWdVZYZgJYZYZYZYZVZoror
-orReoNWHWMgJgJgJgJgJXugJXuoror
-orReoNWducgJgJgJgJgJYZYZVZoror
-orReOoXAZPgJYZMogJSkriYZUooror
-orReEJOfZbsIYZwXSkSkriYZUooror
-orReRejdhdQpYZYtSkSkriYZUooror
-orReReYZYZYZYZYZhvhvYZYZYZoror
-ororororororororororororororor
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+"}
+(2,1,1) = {"
+or
+or
+or
+Re
+Re
+Re
+Re
+Re
+Re
+Re
+Re
+Re
+Re
+Re
+or
+"}
+(3,1,1) = {"
+or
+or
+or
+Re
+Re
+Re
+rw
+Oo
+oN
+oN
+Oo
+EJ
+Re
+Re
+or
+"}
+(4,1,1) = {"
+or
+or
+or
+YZ
+jd
+oN
+uc
+Qu
+WH
+Wd
+XA
+Of
+jd
+YZ
+or
+"}
+(5,1,1) = {"
+or
+or
+or
+YZ
+zE
+xU
+uO
+Wd
+WM
+uc
+ZP
+Zb
+hd
+YZ
+or
+"}
+(6,1,1) = {"
+or
+or
+or
+YZ
+YZ
+YZ
+YZ
+VZ
+gJ
+xU
+gJ
+sI
+Qp
+YZ
+or
+"}
+(7,1,1) = {"
+or
+or
+or
+YZ
+nr
+qO
+DM
+YZ
+gJ
+gJ
+YZ
+YZ
+YZ
+YZ
+or
+"}
+(8,1,1) = {"
+or
+or
+or
+YZ
+Sk
+IJ
+gJ
+gJ
+gJ
+gJ
+Mo
+wX
+Yt
+YZ
+or
+"}
+(9,1,1) = {"
+or
+or
+or
+hv
+yQ
+xU
+cY
+YZ
+gJ
+gJ
+xU
+rG
+Sk
+hv
+or
+"}
+(10,1,1) = {"
+or
+or
+or
+hv
+Sk
+rG
+KO
+YZ
+gJ
+gJ
+Sk
+IX
+Sk
+hv
+or
+"}
+(11,1,1) = {"
+or
+or
+or
+YZ
+Qv
+Sk
+IO
+YZ
+Xu
+YZ
+hH
+ri
+ri
+YZ
+or
+"}
+(12,1,1) = {"
+or
+or
+or
+YZ
+YZ
+YZ
+YZ
+YZ
+Cr
+YZ
+YZ
+YZ
+YZ
+YZ
+or
+"}
+(13,1,1) = {"
+or
+or
+or
+YZ
+Uo
+Uo
+Uo
+VZ
+Xu
+VZ
+Uo
+Uo
+Uo
+YZ
+or
+"}
+(14,1,1) = {"
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+"}
+(15,1,1) = {"
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
+or
 "}

maps/nsv_triumph/submaps/lavaland/shelter.dmm

@@ -1,22 +1,199 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"d" = (/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"e" = (/obj/effect/decal/remains/human,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"n" = (/turf/simulated/wall,/area/lavaland/idleruins)
-"p" = (/obj/effect/decal/remains/robot,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"E" = (/obj/item/material/twohanded/spear/plasteel,/obj/effect/decal/remains/lizard,/turf/simulated/floor/wood,/area/lavaland/idleruins)
-"O" = (/turf/simulated/floor/wood/broken,/area/lavaland/idleruins)
-"P" = (/turf/simulated/floor/outdoors/lavaland,/area/template_noop)
-"X" = (/turf/simulated/floor/outdoors/lavaland,/area/lavaland/idleruins)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/machinery/door/blast/regular,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"d" = (
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"e" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"n" = (
+/turf/simulated/wall,
+/area/lavaland/idleruins)
+"p" = (
+/obj/effect/gibspawner/robot,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"q" = (
+/obj/machinery/door/blast/regular,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"r" = (
+/obj/structure/table/woodentable,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"y" = (
+/obj/structure/boulder,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"z" = (
+/obj/structure/girder/displaced,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"B" = (
+/obj/structure/bookcase,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"C" = (
+/obj/structure/boulder,
+/obj/machinery/door/blast/regular/open,
+/turf/simulated/floor/plating,
+/area/lavaland/idleruins)
+"E" = (
+/obj/item/material/twohanded/spear/plasteel,
+/obj/effect/decal/remains/lizard,
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"O" = (
+/turf/simulated/floor/wood/broken,
+/area/lavaland/idleruins)
+"P" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/template_noop)
+"R" = (
+/obj/structure/boulder,
+/obj/structure/table,
+/turf/simulated/floor/wood/broken,
+/area/lavaland/idleruins)
+"U" = (
+/obj/structure/table/woodentable,
+/obj/item/paper/crumpled/bloody{
+	info = "The rumbling keeps getting louder. Ariel left to get supplies, even though the drones are still out of control. If she takes too much longer I'll have to seal the doors. It feels like the roof is going to come down.";
+	name = "journal scrap"
+	},
+/turf/simulated/floor/wood,
+/area/lavaland/idleruins)
+"V" = (
+/obj/structure/boulder,
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
+"X" = (
+/turf/simulated/floor/outdoors/lavaland,
+/area/lavaland/idleruins)
 
 (1,1,1) = {"
-aaaaaaaaaa
-aaXnnnnnna
-aandOdEena
-aanddddOna
-aandpdddna
-aandOdddna
-aanddddXna
-aannnnXXXa
-aaaaaaaPPP
-aaaaaaaaPP
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+V
+n
+n
+n
+n
+n
+n
+a
+a
+"}
+(4,1,1) = {"
+a
+n
+U
+d
+d
+d
+B
+n
+a
+a
+"}
+(5,1,1) = {"
+a
+n
+R
+d
+p
+O
+B
+n
+a
+a
+"}
+(6,1,1) = {"
+a
+n
+r
+d
+d
+d
+d
+b
+a
+a
+"}
+(7,1,1) = {"
+a
+n
+E
+d
+d
+d
+d
+C
+a
+a
+"}
+(8,1,1) = {"
+a
+n
+e
+O
+y
+d
+X
+q
+P
+a
+"}
+(9,1,1) = {"
+a
+n
+n
+n
+n
+n
+z
+X
+P
+P
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+P
+P
 "}

maps/nsv_triumph/submaps/space/ship_sci_overrun.dmm

@@ -389,6 +389,13 @@
 /mob/living/simple_mob/slime/feral/dark_blue,
 /turf/simulated/floor/airless,
 /area/space/debrisfield/explored)
+"cP" = (
+/obj/machinery/door/airlock/maintenance/rnd{
+	name = "Research Airlock";
+	req_one_access = list(0)
+	},
+/turf/simulated/floor/tiled/white/airless,
+/area/space/debrisfield/explored)
 "gH" = (
 /turf/space,
 /area/space/debrisfield/explored)
@@ -608,7 +615,7 @@ ab
 ab
 ab
 ab
-ax
+cP
 ab
 ab
 ab

tgui/packages/common/storage.js

@@ -11,7 +11,7 @@ export const IMPL_LOCAL_STORAGE = 1;
 export const IMPL_INDEXED_DB = 2;
 
 const INDEXED_DB_VERSION = 1;
-const INDEXED_DB_NAME = 'tgui';
+const INDEXED_DB_NAME = 'tgui-citadel-rp';
 const INDEXED_DB_STORE_NAME = 'storage-v1';
 
 const READ_ONLY = 'readonly';

tgui/packages/tgui-panel/styles/goon/chat-dark.scss

@@ -255,7 +255,7 @@ a.popt {
 /* ADD HERE FOR ITALIC */
 
 
-.italic, .italics, .emote {
+.italic, .italics{
   font-style: italic;
 }
 
@@ -380,6 +380,9 @@ em {
 .say {
 }
 
+.emote {
+}
+
 .deadsay {
   color: #e2c1ff;
 }
@@ -460,10 +463,6 @@ em {
   color: #d82020;
 }
 
-.emote {
-  font-style: italic;
-}
-
 .userdanger {
   color: #c51e1e;
   font-weight: bold;
@@ -881,6 +880,104 @@ em {
   font-family: "Courier New", cursive, sans-serif;
 }
 
+
+
+
+//langs
+.alien {
+  color: #543354;
+}
+
+
+.tajaran {
+  color: #803B56;
+}
+
+
+.tajaran_signlang {
+  color: #941C1C;
+}
+
+.akhani {
+  color: #AC398C;
+}
+
+.skrell {
+  color: #00B0B3;
+}
+
+.skrellfar {
+  color: #70FCFF;
+}
+
+.soghun {
+  color: #228B22;
+}
+
+.solcom {
+  color: #22228B;
+}
+
+.changeling {
+  color: #800080;
+}
+
+.sergal {
+  color: #0077FF;
+}
+
+.birdsongc {
+  color: #CC9900;
+}
+
+.vulpkanin {
+  color: #B97A57;
+}
+
+.enochian {
+  color: #848A33;
+  letter-spacing:-1pt;
+  word-spacing:4pt;
+  font-family: "Lucida Sans Unicode","Lucida Grande", sans-serif;
+}
+
+.daemon {
+  color: #5E339E;
+	letter-spacing:-1pt;
+	word-spacing:0pt;
+	font-family: "Courier New", Courier, monospace;
+}
+
+.bug {
+	color: #9e9e39;
+}
+
+.vox {
+  color: #AA00AA;
+}
+
+.zaddat {
+  color: #941C1C;
+}
+
+.rough {
+  font-family: "Trebuchet MS", cursive, sans-serif;
+}
+
+.say_quote {
+  font-family: Georgia, Verdana, sans-serif;
+}
+
+.terminus {
+  font-family: "Times New Roman", Times, serif, sans-serif
+}
+
+.interface {
+  color: #330033;
+}
+
+
+
 .command_headset {
   font-weight: bold;
   font-size: 160%;

tgui/packages/tgui-panel/styles/goon/chat-light.scss

@@ -274,9 +274,7 @@ a.popt {
 
 .italic,
 .italics,
-.emote {
-  font-style: italic;
-}
+
 
 
 
@@ -398,6 +396,9 @@ em {
 .say {
 }
 
+.emote {
+}
+
 .deadsay {
   color: #5c00e6;
 }
@@ -481,9 +482,7 @@ h1.alert, h2.alert {
   color: #000000;
 }
 
-.emote {
-  font-style: italic;
-}
+
 
 .userdanger {
   color: #ff0000;
@@ -926,6 +925,99 @@ h1.alert, h2.alert {
   font-family: "Courier New", cursive, sans-serif;
 }
 
+//langs
+.alien {
+  color: #543354;
+}
+
+
+.tajaran {
+  color: #803B56;
+}
+
+
+.tajaran_signlang {
+  color: #941C1C;
+}
+
+.akhani {
+  color: #AC398C;
+}
+
+.skrell {
+  color: #00B0B3;
+}
+
+.skrellfar {
+  color: #70FCFF;
+}
+
+.soghun {
+  color: #228B22;
+}
+
+.solcom {
+  color: #22228B;
+}
+
+.changeling {
+  color: #800080;
+}
+
+.sergal {
+  color: #0077FF;
+}
+
+.birdsongc {
+  color: #CC9900;
+}
+
+.vulpkanin {
+  color: #B97A57;
+}
+
+.enochian {
+  color: #848A33;
+  letter-spacing:-1pt;
+  word-spacing:4pt;
+  font-family: "Lucida Sans Unicode","Lucida Grande", sans-serif;
+}
+
+.daemon {
+  color: #5E339E;
+	letter-spacing:-1pt;
+	word-spacing:0pt;
+	font-family: "Courier New", Courier, monospace;
+}
+
+.bug {
+	color: #9e9e39;
+}
+
+.vox {
+  color: #AA00AA;
+}
+
+.zaddat {
+  color: #941C1C;
+}
+
+.rough {
+  font-family: "Trebuchet MS", cursive, sans-serif;
+}
+
+.say_quote {
+  font-family: Georgia, Verdana, sans-serif;
+}
+
+.terminus {
+  font-family: "Times New Roman", Times, serif, sans-serif
+}
+
+.interface {
+  color: #330033;
+}
+
 .command_headset {
   font-weight: bold;
   font-size: 160%;

tgui/packages/tgui/interfaces/CrewMonitor.js

@@ -8,7 +8,7 @@ import { Fragment } from 'inferno';
 
 export const CrewMonitor = () => {
   return (
-    <Window 
+    <Window
       width={800}
       height={600}
       resizable>
@@ -129,8 +129,8 @@ export const CrewMonitorContent = (props, context) => {
           ))}
         <NanoMap zoom={mapZoom}>
           {crew
-            .filter(x => 
-              (x.sensor_type === 3 && ~~x.realZ === ~~config.mapZLevel)
+            .filter(x =>
+              (x.sensor_type === 3 && ~~x.z === ~~config.mapZLevel)
             ).map(cm => (
               <NanoMap.Marker
                 key={cm.ref}