fgh

_maps/map_files/debug/wasteland.dmm

@@ -243,7 +243,7 @@
 "eI" = (/obj/structure/decoration/sign{desc = "The door to the right, leads to the Firing Range area simulation."; icon_state = "vault_guns"; name = "guns area sign"; pixel_y = 29},/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
 "eJ" = (/obj/structure/decoration/sign{desc = "The door to the right, leads to the Race Track area simulation."; icon_state = "vault_track"; name = "track area sign"; pixel_y = 29},/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
 "eK" = (/obj/structure/decoration/sign{pixel_y = 29},/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
-"eL" = (/obj/effect/landmark{name = "JoinLate"},/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
+"eL" = (/obj/effect/landmark/vr_spawn,/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
 "eM" = (/obj/machinery/light,/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
 "eN" = (/turf/open/floor/f13{icon_state = "whitedir"},/area/f13/secret)
 "eO" = (/obj/structure/decoration/sign{pixel_y = -35},/turf/open/floor/f13{icon_state = "white"},/area/f13/secret)
@@ -566,7 +566,7 @@ aaabababababababababababababababababababababaadududududududududududAdudududududu
 aaaaaaaaaaaaaaaaaaaaezabezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeAdAeAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaezadezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaezaeezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezaa
 aaeCeCeDeCeCeCeEeCeFeCeGeCeEeCeCeCeHeCeCeCeEeCeCeCeDeCeCeCeEeCeIeCeGeCeEeCeCeCeHeCeCeCeEeCeCeCeDeCeCeCeEeCeJeCeGeCeEeCeCeCeHeCeCeCeEeCeCeDeCeCeCeCeEeCeKeCeGeCeEeCeCeCeHeCeCeCeEeCeCeCeDeCeCeCeEeCeCeCaa
-aaeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeLeLeLeLeLeLeLeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCaa
+aaeCeLeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCeCaa
 aaeCeCeMeCeCeCeCeCeCeCeNeCeOeCeCeCeMeCeCeCeCeCeCeCeMeCeCeCeCeCeCeCeNeCePeCeCeCeMeCeCeCeCeCeCeCeMeCeCeCeCeCeCeCeNeCeQeCeCeCeMeCeCeCeCeCeCeCeMeCeCeCeCeCeCeCeNeCeReCeCeCeMeCeCeCeCeCeCeCeMeCeCeCeCeCeCeCaa
 aaezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezeBezezezezezezezezezezezezezezezezezezezezezaa
 aaaaaaaaaaaaaaaaaaaaezadezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaezeSezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaezeTezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaezgPezaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

_maps/texas.dm

@@ -6,6 +6,7 @@
 
 		#include "map_files\TexasWasteland\texas_wasteland.dmm"
 		#include "map_files\TexasWasteland\z2.dmm"
+		#include "map_files\debug\wasteland.dmm"
 		///#include "map_files\TexasWasteland\navarro.dmm"
 		///#include "map_files\TexasWasteland\fartexas.dmm"
         ///#include "map_files\TexasWasteland\z3.dmm"

code/modules/fallout/misc/jobs/job/brotherhood.dm

@@ -56,7 +56,7 @@
 	name = "Elder"
 	backpack = null
 	satchel = null
-	id = /obj/item/card/id/f13/dogtag
+	id = /obj/item/card/id/dogtag
 	uniform = /obj/item/clothing/under/f13/combat
 	shoes = /obj/item/clothing/shoes/f13/military
 	suit = /obj/item/clothing/suit/f13/elder
@@ -116,7 +116,7 @@
 	name = "Paladin"
 	backpack = null
 	satchel = null
-	id = /obj/item/card/id/f13/dogtag
+	id = /obj/item/card/id/dogtag
 	gloves = /obj/item/clothing/gloves/f13/military
 	uniform = /obj/item/clothing/under/f13/combat
 	shoes = /obj/item/clothing/shoes/f13/military
@@ -178,7 +178,7 @@
 	name = "Knight"
 	backpack = null
 	satchel = null
-	id = /obj/item/card/id/f13/dogtag
+	id = /obj/item/card/id/dogtag
 	gloves = /obj/item/clothing/gloves/f13/military
 	uniform = /obj/item/clothing/under/f13/combat
 	shoes = /obj/item/clothing/shoes/f13/military
@@ -232,7 +232,7 @@
 	name = "Scriber"
 	backpack = null
 	satchel = null
-	id = /obj/item/card/id/f13/dogtag
+	id = /obj/item/card/id/dogtag
 	uniform = /obj/item/clothing/under/f13/combat
 	shoes = /obj/item/clothing/shoes/f13/tan
 	suit = /obj/item/clothing/suit/f13/scribe

code/modules/fallout/misc/jobs/job/city.dm

@@ -117,7 +117,7 @@
 
 /datum/outfit/job/sheriff
 	name = "Sheriff"
-	id = /obj/item/card/id/f13/sheriff
+	id = /obj/item/card/id/sheriff
 	uniform = /obj/item/clothing/under/f13/cowboyb
 	shoes = /obj/item/clothing/shoes/f13/cowboy
 	suit = /obj/item/clothing/suit/f13/sheriff

code/modules/fallout/misc/jobs/job/vault.dm

@@ -52,7 +52,7 @@
 	id = /obj/item/weapon/card/id/gold
 	glasses = /obj/item/clothing/glasses/sunglasses
 	r_pocket = /obj/item/device/pda/captain
-	uniform = /obj/item/clothing/under/f13/vault/v13
+	uniform = /obj/item/clothing/under/f13/vault/v113
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 
 /datum/job/dweller
@@ -144,7 +144,7 @@
 	uniform = /obj/item/clothing/under/f13/vault/v113
 	id = /obj/item/weapon/card/id
 	belt = /obj/item/device/pda/security
-	shoes = /obj/item/clothing/shoes/sneakers/brown
+	shoes = /obj/item/clothing/shoes/f13/military
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/helmet/riot
 	suit = /obj/item/clothing/suit/armor/vest/alt
@@ -155,15 +155,6 @@
 
 ///science///
 
-/datum/outfit/job/vltsci
-	name = "Scientist VLT"
-	jobtype = /datum/job/scientist
-
-	belt = /obj/item/device/pda/toxins
-	uniform = /obj/item/clothing/under/f13/vault/v13
-	shoes = /obj/item/clothing/shoes/sneakers/brown
-	suit = /obj/item/clothing/suit/toggle/labcoat/f13/followers
-
 /datum/job/vltsci
 	title = "Vault Sciencist"
 	flag = VAULT_SCIENCIST/*science*/
@@ -180,7 +171,7 @@
 
 	required_items = list(
 	/obj/item/clothing/under/f13/vault/v113,
-	/obj/item/clothing/suit/toggle/labcoat/f13/followers,
+	/obj/item/clothing/suit/toggle/labcoat/f13/followers
 	)
 	denied_items = list(
 	/obj/item/clothing/shoes/f13/rag,
@@ -201,4 +192,59 @@
 
 	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage, access_genetics)
 	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom)
-	outfit = /datum/outfit/job/vltsci
+	outfit = /datum/outfit/job/vltsci
+
+/datum/outfit/job/vltsci
+	name = "Scientist VLT"
+	belt = /obj/item/device/pda/toxins
+	uniform = /obj/item/clothing/under/f13/vault/v113
+	shoes = /obj/item/clothing/shoes/laceup
+	suit = /obj/item/clothing/suit/toggle/labcoat/f13/followers
+
+/datum/job/vlteng
+	title = "Vault Engineer"
+	flag = VAULT_ENGINEER/*engineers*/
+	department_head = list("Overseer")
+	department_flag = FOB
+	faction = "vault"
+	status = "engineer"
+	total_positions = 4
+	spawn_positions = 4
+	supervisors = "overseer"
+	selection_color = "#005A20"
+
+	allowed_packs = list("starter", "cigarettes")
+
+	required_items = list(
+	/obj/item/clothing/under/f13/vault/v113,
+	/obj/item/clothing/suit/toggle/labcoat/f13/followers,
+	)
+	denied_items = list(
+	/obj/item/clothing/shoes/f13/rag,
+	/obj/item/clothing/head/f13/headscarf,
+	/obj/item/clothing/head/f13/pot,
+	/obj/item/clothing/under/pants/f13/ghoul,
+	/obj/item/clothing/under/pants/f13/cloth,
+	/obj/item/clothing/under/pants/f13/caravan,
+	/obj/item/clothing/under/f13/rag,
+	/obj/item/clothing/under/f13/tribal,
+	/obj/item/clothing/under/f13/female/tribal,
+	/obj/item/clothing/under/f13/settler,
+	/obj/item/clothing/under/f13/brahmin,
+	/obj/item/clothing/under/f13/female/brahmin,
+	/obj/item/clothing/under/f13/worn,
+	/obj/item/clothing/suit/f13/mantle_liz
+	)
+
+	access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat)
+	minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_tcomsat)
+	outfit = /datum/outfit/job/vlteng
+
+/datum/outfit/job/vlteng
+	name = "Engineer VLT"
+	satchel = /obj/item/weapon/storage/backpack/satchel/eng
+	head = /obj/item/clothing/head/hardhat/dblue
+	r_pocket = /obj/item/device/pda/engineering
+	belt = /obj/item/weapon/storage/belt/utility/full
+	uniform = /obj/item/clothing/under/f13/vault/v113
+	shoes = /obj/item/clothing/shoes/workboots

code/modules/fallout/misc/jobs/jobs.dm

@@ -52,7 +52,8 @@ var/const/FOB				=(1<<9)
 var/const/VAULT_OVERSEER	=(1<<0)
 var/const/VAULT_RESIDENT	=(1<<1)
 var/const/VAULT_SECURITY	=(1<<5)
-var/const/VAULT_SCIENCIST	=(1<<5)
+var/const/VAULT_SCIENCIST	=(1<<6)
+var/const/VAULT_ENGINEER	=(1<<7)
 
 var/const/COC				=(1<<12)
 var/const/CHILDOFCATHEDRAL	=(1<<0)

fallout13.dme

@@ -15,6 +15,7 @@
 // BEGIN_INCLUDE
 #include "_maps\__MAP_DEFINES.dm"
 #include "_maps\texas.dm"
+#include "_maps\map_files\debug\wasteland.dmm"
 #include "_maps\map_files\TexasWasteland\texas_wasteland.dmm"
 #include "_maps\map_files\TexasWasteland\z2.dmm"
 #include "_maps\RandomZLevels\centcomAway.dmm"

interactions/interaction_definitions.dm

@@ -96,7 +96,7 @@ datum/interaction/kiss/evaluate_user(var/mob/user, var/silent=1)
 	command = "pinkypromise"
 	description = "Ïèíêè-êëÿòâà!"
 	require_user_hands = 1
-	simple_message = "USER says, ''Ðóêó íà ñåðäöå, áåç ëèøíèõ ôðàç! Ïèðîæîê ìíå ïðÿìî â ãëàç!''"
+	simple_message = "<b>USER</b> says, ''Ðóêó íà ñåðäöå, áåç ëèøíèõ ôðàç! Ïèðîæîê ìíå ïðÿìî â ãëàç!''"
 	needs_physical_contact = 1
 
 /datum/interaction/bird