last minute fixes (#104)

Co-authored-by: grade9fixer <[email protected]>
Co-authored-by: xTrainx <[email protected]>

_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm

@@ -11068,7 +11068,6 @@
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
 /obj/machinery/cell_charger,
-/obj/item/integrated_circuit_printer,
 /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{
 	icon_state = "darkdirtysolid"
 	},

_maps/map_files/Pahrump-AB/Pahrump-AB.dmm

@@ -23563,6 +23563,10 @@
 /obj/item/candle/infinite,
 /turf/open/floor/f13/wood,
 /area/f13/city)
+"dNp" = (
+/obj/effect/landmark/start/f13/auxilia,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
 "dNv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/flora/grass/coyote/one,
@@ -37489,6 +37493,14 @@
 	icon_state = "redrustyfull"
 	},
 /area/f13/building/firestation)
+"kgu" = (
+/obj/effect/landmark/start/f13/auxilia,
+/turf/open/indestructible/ground/outside/gravel{
+	color = "#B7ABAB";
+	footstep = "dirt";
+	name = "rocky dirt"
+	},
+/area/f13/wasteland)
 "kgQ" = (
 /obj/structure/barricade/bars,
 /obj/structure/table,
@@ -44412,6 +44424,13 @@
 /obj/structure/simple_door/metal/store,
 /turf/open/floor/plasteel/f13/vault_floor/blue/whitebluefull,
 /area/f13/building)
+"ngf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/f13/ncrrearechelon,
+/turf/open/indestructible/ground/outside/road{
+	icon_state = "verticalinnermain1"
+	},
+/area/f13/wasteland)
 "ngi" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
@@ -62247,6 +62266,10 @@
 	icon_state = "innermaincornerinner"
 	},
 /area/f13/wasteland)
+"vwj" = (
+/obj/effect/landmark/start/f13/campfollower,
+/turf/open/indestructible/ground/outside/gravel,
+/area/f13/wasteland)
 "vwt" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/ground/outside/road{
@@ -63177,6 +63200,10 @@
 /obj/machinery/light,
 /turf/open/floor/f13/wood,
 /area/f13/building/mall)
+"vTo" = (
+/obj/effect/landmark/start/f13/campfollower,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
 "vTp" = (
 /obj/structure/fluff/railing{
 	dir = 1;
@@ -75405,7 +75432,7 @@ uNJ
 bMM
 qmG
 bwV
-evq
+ngf
 evq
 uNJ
 uNJ
@@ -120593,7 +120620,7 @@ eBH
 aGR
 etg
 aGR
-aOk
+vTo
 aGR
 xOD
 eXj
@@ -120850,7 +120877,7 @@ eBH
 aGR
 aOk
 aGR
-aOk
+dNp
 aGR
 xOD
 vGl
@@ -124181,7 +124208,7 @@ sqb
 aii
 sqb
 sqb
-sqb
+kgu
 dmB
 njO
 oRY
@@ -125205,7 +125232,7 @@ xLC
 xLC
 aii
 aii
-aii
+vwj
 aii
 aii
 xLC

code/game/machinery/dance_machine.dm

@@ -577,7 +577,7 @@
 	var/datum/track/R = new ()
 
 /obj/item/record_disk/Initialize() //moves them a bit so they are not all accumulated on the same pixel
-	..()
+	. = ..()
 	name = "Generic record disk" // the name changes with music
 	pixel_x = rand(-3, 3)
 	pixel_y = rand(-3, 3)

code/modules/hydroponics/grown/random.dm

@@ -15,8 +15,6 @@
 /obj/item/seeds/random/Initialize()
 	. = ..()
 	randomize_stats()
-	if(prob(60))
-		add_random_reagents(1, 3)
 	if(prob(50))
 		add_random_traits(1, 2)
 	add_random_plant_type(35)

code/modules/hydroponics/grown/tobacco.dm

@@ -46,7 +46,6 @@
 		/datum/reagent/consumable/nutriment = 0.03
 	)
 	rarity = 20
-	genes = list(/datum/plant_gene/trait/smoke) //get it? because you smoke tobacco? i'm hilarious.
 
 /obj/item/reagent_containers/food/snacks/grown/tobacco/space
 	seed = /obj/item/seeds/tobacco/space

code/modules/hydroponics/plant_genes.dm

@@ -430,7 +430,7 @@
 			G.reagents.reaction(L, INJECT, fraction)
 			G.reagents.trans_to(L, injecting_amount)
 			to_chat(target, span_danger("You are pricked by [G]!"))
-
+/*
 /datum/plant_gene/trait/smoke
 	name = "gaseous decomposition"
 
@@ -442,7 +442,7 @@
 	S.set_up(G.reagents, smoke_amount, splat_location, 0)
 	S.start()
 	G.reagents.clear_reagents()
-
+*/
 /datum/plant_gene/trait/fire_resistance // Lavaland
 	name = "Fire Resistance"
 

code/modules/jobs/job_types/bos.dm

@@ -12,7 +12,7 @@ Main doors: ACCESS_BOS 120
 	access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
 	minimal_access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
 	forbids = "The Brotherhood of Steel Forbids: Unethical human experimentation. Violence beyond what is needed to accomplish Brotherhood goals, and cruel torture or experiments on the minds or bodies of prisoners."
-	enforces = "The Brotherhood of Steel Expects: Obeying the Chain That - Binds your direct superior. Collection and safeguarding of technology from the wasteland. Experimentation and research."
+	enforces = "The Brotherhood of Steel Expects: Obeying the Paladin in charge of this expedition. Collection and safeguarding of technology from the wasteland. Experimentation and research."
 	outfit = /datum/outfit/job/bos/
 
 	objectivesList = list(
@@ -159,8 +159,8 @@ Paladin Commander
 	title = "Head Paladin"
 	flag = F13PALADINCOMMANDER
 	head_announce = list("Security")
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	description = "You are the acting field commander until the Brotherhood regains its strength enough to place an Elder for the bunker. You are a veteran of many battles and sorties in pursuit of Brotherhood goals; your only weakness may just be your hubris. Your main goals are defense of the Chapter and surveillance of the surrounding region for technology."
 	supervisors = "the Elders"
 	selection_color = "#7f8c8d"
@@ -434,8 +434,8 @@ Paladin
 	flag = F13PALADIN
 	total_positions = 1
 	spawn_positions = 1
-	description = "You are this Chapter's main line of defense and offense; highly trained in combat and weaponry though with little practical field experience, you are eager to prove your worth to the Brotherhood. Your primary duties are defense and surface operations. You may also be assigned a trainee Initiate."
-	supervisors = "the Head and Senior Paladin"
+	description = "You are this Chapter's main line of defense and offense, and the leader of this expedition; highly trained in combat and weaponry though with little practical field experience, you are eager to prove your worth to the Brotherhood. Your primary duties are defense and surface operations. You may also be assigned a trainee Initiate."
+	supervisors = "the Elders"
 	display_order = JOB_DISPLAY_ORDER_PALADIN
 	outfit = /datum/outfit/job/bos/f13paladin
 	exp_requirements = 1200
@@ -479,7 +479,7 @@ Paladin
 	mask =	/obj/item/clothing/mask/gas/sechailer
 	neck =	/obj/item/clothing/neck/mantle/bos/paladin
 	backpack_contents = list(
-		/obj/item/reagent_containers/hypospray/medipen/stimpak= 4,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 4,
 		/obj/item/melee/onehanded/knife/hunting = 1,
 		/obj/item/stock_parts/cell/ammo/mfc = 5
 	)
@@ -746,8 +746,8 @@ Knight
 /datum/job/bos/f13knight
 	title = "Knight"
 	flag = F13KNIGHT
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 5
+	spawn_positions = 5
 	description = "You are the Brotherhood Knight, the veritable lifeblood of your organization. You are a versatile and adaptably trained person: from your primary duties of weapon & armor repair to basic combat, survival and stealth skills, the only thing you lack is proper experience. You are also in charge of Initiates."
 	supervisors = "the Head and Knight-Sergeant"
 	display_order = JOB_DISPLAY_ORDER_KNIGHT
@@ -828,8 +828,8 @@ Initiate
 /datum/job/bos/f13initiate
 	title = "Initiate"
 	flag = F13INITIATE
-	total_positions = 4
-	spawn_positions = 4
+	total_positions = 5
+	spawn_positions = 5
 	description = "Either recently inducted or born into the Brotherhood, you have since proven yourself worthy of assignment to the Chapter. You are to assist your superiors and receive training how they deem fit. You are NEVER allowed to leave the bunker without the direct supervision of a superior; doing so may result in exile."
 	supervisors = "the Scribes, Knights, or Paladins"
 	display_order = JOB_DISPLAY_ORDER_INITIATE

code/modules/jobs/job_types/oasis.dm

@@ -111,6 +111,7 @@ Mayor
 	backpack_contents = list(
 	/obj/item/clothing/under/f13/general/oasis = 1,
 	/obj/item/clothing/head/f13/army/general = 1,
+	/obj/item/gun/ballistic/automatic/pistol/m1911/custom/jackal = 1,
 	/obj/item/ammo_box/magazine/m45 = 2,
 	/obj/item/clothing/shoes/jackboots = 1,
 	/obj/item/clothing/mask/cigarette/pipe/cobpipe = 1

code/modules/jobs/job_types/wasteland.dm

@@ -1420,9 +1420,9 @@ Raider
 		/obj/item/reagent_containers/food/snacks/store/bread/plain = 5,
 		/obj/item/reagent_containers/food/snacks/fishmeat/salmon = 2,
 		/obj/item/reagent_containers/glass/beaker/waterbottle = 2,
-		/obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 1
 	)	//Matthew 14:17 RSVCE and KJV - Kitsunemitsu
 				//Nerd shit, wataur time. ~TK
+					//Both of you need to be reduced to ash. No more furry shit. - Hangyul
 
 /datum/outfit/loadout/cleanser
 	name = "Cleanser"
@@ -1545,7 +1545,7 @@ Raider
 		/obj/item/reagent_containers/hypospray/medipen/stimpak=2,
 		/obj/item/storage/fancy/candle_box,
 		/obj/item/storage/wallet/stash/mid,
-		/obj/item/nullrod = 1,)
+		)
 //end preacher
 
 /*/datum/outfit/job/wasteland/f13enforcer

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -667,6 +667,7 @@
 /obj/item/gun/ballistic/revolver/ghoulgun
 	name = "rusted revolver"
 	desc = "A worn but well-maintained revolver. Uses shotgun rounds, with a heavy barrel for greater velocity."
+	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	icon_state = "ghoulgun"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/ghoulgun
 	weapon_class = WEAPON_CLASS_SMALL

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -264,6 +264,8 @@
 /datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, multiplier)
 	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
+	if(holder.has_reagent(/datum/reagent/toxin))
+		return
 	holder.remove_reagent(/datum/reagent/smoke_powder, multiplier*3)
 	var/smoke_radius = round(sqrt(multiplier * 0.2), 1)
 	var/location = get_turf(holder.my_atom)
@@ -284,6 +286,8 @@
 	mob_react = FALSE
 
 /datum/chemical_reaction/smoke_powder_smoke/on_reaction(datum/reagents/holder, multiplier)
+	if(holder.has_reagent(/datum/reagent/toxin))
+		return
 	var/location = get_turf(holder.my_atom)
 	var/smoke_radius = round(sqrt(multiplier / 2), 1)
 	var/datum/effect_system/smoke_spread/chem/S = new

code/modules/research/techweb/all_nodes.dm

@@ -78,7 +78,7 @@
 	prereq_ids = list("base")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
-
+/*
 /datum/techweb_node/adv_datatheory
 	id = "adv_datatheory"
 	display_name = "Advanced Data Theory"
@@ -87,7 +87,7 @@
 	design_ids = list("icprinter", "icupgadv", "icupgclo")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
-
+*/
 /////////////////////////engineering tech/////////////////////////
 /datum/techweb_node/engineering
 	id = "engineering"
@@ -398,7 +398,7 @@
 	id = "cyber_implants"
 	display_name = "Cybernetic Implants"
 	description = "Electronic implants that improve humans."
-	prereq_ids = list("adv_biotech", "adv_datatheory")
+	prereq_ids = list("adv_biotech")
 	design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", /*"ci-medhud", "ci-sechud",*/ "ci-service")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000

code/modules/research/techweb/nodes/medical_nodes.dm

@@ -90,7 +90,7 @@
 	id = "cyber_implants"
 	display_name = "Cybernetic Implants"
 	description = "Electronic implants that improve humans."
-	prereq_ids = list("adv_biotech", "adv_datatheory")
+	prereq_ids = list("adv_biotech")
 	design_ids = list("ci-nutriment", "ci-breather", "ci-gloweyes", "ci-welding", /*"ci-medhud", "ci-sechud",*/ "ci-service")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 

code/modules/research/techweb/nodes/misc_nodes.dm

@@ -6,14 +6,15 @@
 	description = "Big Data, in space!"
 	prereq_ids = list("base")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
-
-/datum/techweb_node/adv_datatheory
+/*
+/datum/techweb_node/
 	id = "adv_datatheory"
 	display_name = "Advanced Data Theory"
 	description = "Better insight into programming and data."
 	prereq_ids = list("datatheory")
 	design_ids = list("icprinter", "icupgadv", "icupgclo")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
+*/
 
 /////////////////////////plasma tech/////////////////////////
 /datum/techweb_node/basic_plasma