More train small changes (#151)

code/controllers/subsystem/nightcycle.dm

@@ -190,7 +190,7 @@ SUBSYSTEM_DEF(nightcycle)
 	luminosity = 1
 	for(var/dir in GLOB.alldirs)
 		var/turf/neighbor = get_step(src, dir)
-		if(!neighbor || neighbor.sunlight_state != NO_SUNLIGHT)
+		if(!neighbor || neighbor?.sunlight_state && neighbor?.sunlight_state != NO_SUNLIGHT)
 			continue
 		neighbor.sunlight_state = SUNLIGHT_BORDER
 		if(neighbor.flags_1 & INITIALIZED_1)

code/datums/components/crafting/guncrafting.dm

@@ -375,7 +375,7 @@
 	icon_state = "advanced_bench"
 	desc = "A large and advanced pre-war workbench to tackle any project!"
 	machine_tool_behaviour = list(TOOL_AWORKBENCH, TOOL_WORKBENCH)
-	wrenchable = FALSE
+	wrenchable = TRUE
 	can_disassemble = TRUE
 	disassembly_steps_remaining = WB_DISASSEMBLY_STEP_SCREW | WB_DISASSEMBLY_STEP_WELD | WB_DISASSEMBLY_STEP_CUT | WB_DISASSEMBLY_STEP_CROWBAR | WB_DISASSEMBLY_STEP_CLUB
 	disassembly_start_step = WB_DISASSEMBLY_STEP_ELECTRONICS

code/datums/traits/negative.dm

@@ -767,7 +767,12 @@ Edit: TK~  This is the dumbest fucking shit I've ever seen in my life.  This isn
 /datum/quirk/masked_mook/on_spawn()
 	. = ..()
 	var/mob/living/carbon/human/H = quirk_holder
-	var/obj/item/clothing/mask/gas = new(get_turf(quirk_holder))
+	var/list/obj/item/clothing/masks = subtypesof(/obj/item/clothing/mask)
+	var/obj/item/clothing/mask/chosen = pick(masks)
+	var/list/ciggies = subtypesof(/obj/item/clothing/mask/cigarette)
+	while(chosen in ciggies)
+		chosen = pick(masks)
+	var/obj/item/clothing/mask/gas = new chosen(get_turf(quirk_holder))
 	H.equip_to_slot(gas, SLOT_WEAR_MASK)
 	H.regenerate_icons()
 

code/game/machinery/doors/unpowered.dm

@@ -174,7 +174,7 @@
 	visible = FALSE
 	explosion_block = FALSE
 	proj_pass_rate = 95
-	req_access_txt = null
+	req_access_txt = "123"
 
 /obj/machinery/door/unpowered/secure_legion/update_icon()
 	if(density)

code/game/machinery/radio_management.dm

@@ -5,6 +5,7 @@ GLOBAL_LIST_EMPTY(faction_radios)
 GLOBAL_LIST_EMPTY(ncr_radios)
 GLOBAL_LIST_EMPTY(legion_radios)
 GLOBAL_LIST_EMPTY(bos_radios)
+GLOBAL_LIST_EMPTY(enclave_radios)
 
 /obj/machinery/radioterminal
 	name = "radio control"
@@ -46,6 +47,10 @@ GLOBAL_LIST_EMPTY(bos_radios)
 			for(var/obj/item/radio/radio in GLOB.bos_radios)
 				if(radio.linked_mob)
 					dat += "<a href='?src=[REF(src)];terminate=[REF(radio)]'> [radio.name] linked to [radio.linked_mob]<br>"
+		if(FACTION_ENCLAVE)
+			for(var/obj/item/radio/radio in GLOB.enclave_radios)
+				if(radio.linked_mob)
+					dat += "<a href='?src=[REF(src)];terminate=[REF(radio)]'> [radio.name] linked to [radio.linked_mob]<br>"
 	var/datum/browser/popup = new(user, "radio_console", "Radio Terminal")
 	popup.set_content(dat)
 	popup.open()
@@ -69,6 +74,8 @@ GLOBAL_LIST_EMPTY(bos_radios)
 					LAZYREMOVE(GLOB.legion_radios, terminate)
 				if(FACTION_BROTHERHOOD)
 					LAZYREMOVE(GLOB.bos_radios, terminate)
+				if(FACTION_ENCLAVE)
+					LAZYREMOVE(GLOB.enclave_radios, terminate)
 	updateUsrDialog()
 	return
 
@@ -114,3 +121,9 @@ GLOBAL_LIST_EMPTY(bos_radios)
 	name = "Brotherhood radio control"
 	assigned_faction = FACTION_BROTHERHOOD
 	req_one_access = list(ACCESS_BROTHERHOOD_COMMAND)
+
+
+/obj/machinery/radioterminal/eclave
+	name = "Enclave radio control"
+	assigned_faction = FACTION_ENCLAVE
+	req_one_access = list(ACCESS_ENCLAVE)

code/game/mecha/combat/phazon.dm

@@ -42,6 +42,7 @@
 	dna_lock
 	step_in = 0.6
 	dir_in = 2
+	normal_step_energy_drain = 0.75
 	step_energy_drain = 0.75
 	max_integrity = 150
 	deflect_chance = 30
@@ -127,6 +128,7 @@
 	dna_lock
 	step_in = 0.8
 	dir_in = 2
+	normal_step_energy_drain = 0.7
 	step_energy_drain = 0.7
 	max_integrity = 200
 	deflect_chance = 30
@@ -206,6 +208,7 @@
 	dna_lock
 	step_in = 0.6
 	dir_in = 2
+	normal_step_energy_drain = 0.75
 	step_energy_drain = 0.75
 	max_integrity = 150
 	deflect_chance = 30
@@ -277,6 +280,7 @@
 	dna_lock
 	step_in = 0.6
 	dir_in = 2
+	normal_step_energy_drain = 0.75
 	step_energy_drain = 0.75
 	max_integrity = 150
 	deflect_chance = 30

code/game/mecha/mecha_actions.dm

@@ -318,7 +318,7 @@
 			chassis.landing_mode = 1
 			chassis.bumpsmash = 1
 			chassis.step_in = 7
-			chassis.step_energy_drain = 0.8
+			chassis.step_energy_drain = 0.4
 			chassis.occupant_message(span_danger("You are landing."))
 	else
 		if(chassis.mechazmove(UP))

code/game/objects/items/devices/radio/headset.dm

@@ -386,6 +386,8 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "This is used by the enclave.\nTo access the enclave channel, use :z. Protects ears from flashbangs."
 	icon_state = "syndie_headset"
 	keyslot = new /obj/item/encryptionkey/headset_enclave
+	factionized = TRUE
+	linked_faction = FACTION_ENCLAVE
 
 /obj/item/radio/headset/headset_enclave/ComponentInitialize()
 	. = ..()

code/game/objects/items/devices/radio/radio.dm

@@ -101,6 +101,8 @@
 				LAZYREMOVE(GLOB.legion_radios, src)
 			if(FACTION_BROTHERHOOD)
 				LAZYREMOVE(GLOB.bos_radios, src)
+			if(FACTION_ENCLAVE)
+				LAZYREMOVE(GLOB.enclave_radios, src)
 	GLOB.radio_list -= src //Big-Iron, removes radio from radio list lmao
 	remove_radio_all(src) //Just to be sure
 	QDEL_NULL(wires)
@@ -143,6 +145,8 @@
 				LAZYADD(GLOB.legion_radios, src)
 			if(FACTION_BROTHERHOOD)
 				LAZYADD(GLOB.bos_radios, src)
+			if(FACTION_ENCLAVE)
+				LAZYADD(GLOB.enclave_radios, src)
 
 /obj/item/radio/ComponentInitialize()
 	. = ..()

code/game/objects/items/loadout_beacons.dm

@@ -54,6 +54,7 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	var/list/multiple_choice = list()
 	/// Just to limit how many things can be taken out, cus apparently thats a thing
 	var/max_items
+	var/spawned_thing = FALSE
 
 /obj/item/kit_spawner/waster
 	name = "Wasteland survival kit"
@@ -388,12 +389,15 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 
 /obj/item/kit_spawner/proc/spawn_the_thing(mob/user, atom/the_thing)
 	hax_check()
+	if(spawned_thing)
+		return
 	max_items--
 	var/turf/spawn_here
 	spawn_here = user ? get_turf(user) : get_turf(src)
 	var/obj/item/new_thing = new the_thing(spawn_here)
 	if(istype(new_thing))
 		user.show_message(span_green("You pull \a [new_thing.name] out of [src]."))
+		spawned_thing = TRUE
 		return TRUE
 
 /obj/item/storage/box/gun

code/modules/clothing/suits/arfsuits_unused.dm

@@ -424,6 +424,8 @@ Suits. 0-10 in its primary value, slowdown 0, various utility
 /obj/item/clothing/suit/armor/medium/combat/desert_ranger/patrol
 	name = "desert ranger patrol armor"
 	desc = "A set of desert ranger patrol armor, modified to be light and breezy here in the swamps, perfect for making blood sausage."
+	icon = 'icons/fallout/clothing/armored_medium.dmi'
+	mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
 	icon_state = "ncr_patrol"
 	item_state = "ncr_patrol"
 	stiffness = LIGHT_STIFFNESS

fallout/code/modules/client/loadout/head.dm

@@ -290,9 +290,9 @@
 	cost = 4
 	subcategory = LOADOUT_SUBCATEGORY_HEAD_FACTIONS
 	restricted_desc = "NCR"
-	restricted_roles = list("NCR Combat Engineer",
+/*	restricted_roles = list("NCR Combat Engineer",
 							"NCR Off-Duty"
-						)
+						)*/
 
 /datum/gear/head/ncr_cap
 	name = "NCR garrison cap"

modular_BD2/blacksmith/code/finished_items.dm

@@ -26,7 +26,7 @@
 	var/quality
 	var/overlay_state = "woodenrod"
 	var/mutable_appearance/overlay
-	var/wield_force = 15
+	force_wielded = 15
 
 /obj/item/melee/smith/Initialize()
 	. = ..()
@@ -54,7 +54,7 @@
 	total_mass = (TOTAL_MASS_MEDIEVAL_WEAPON * 1.5)
 	max_integrity = 200
 	flags_1 = CONDUCT_1
-	var/wield_force
+	force_wielded
 	wielded_mult = 1.5
 	var/mutable_appearance/overlay
 	var/overlay_state = "woodenrod"

modular_BD2/blacksmith/code/smithed_items.dm

@@ -632,8 +632,9 @@
 /obj/item/smithing/katanablade/startfinish()
 	var/obj/item/twohanded/smithed/katana/finalforreal = new /obj/item/twohanded/smithed/katana(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield") // - icon_wielded basically makes the wield icon for direct click wield, sort of redundant if you change it to shift-x only
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield") // - icon_wielded basically makes the wield icon for direct click wield, sort of redundant if you change it to shift-x only
 	finalitem = finalforreal
 	..()
 
@@ -648,8 +649,9 @@
 /obj/item/smithing/longswordblade/startfinish()
 	var/obj/item/twohanded/smithed/katana/longsword/finalforreal = new /obj/item/twohanded/smithed/katana/longsword(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalitem = finalforreal
 	..()
 
@@ -664,8 +666,9 @@
 /obj/item/smithing/scrapblade/startfinish()
 	var/obj/item/twohanded/smithed/katana/scrapblade/finalforreal = new /obj/item/twohanded/smithed/katana/scrapblade(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalitem = finalforreal
 	..()
 
@@ -679,8 +682,9 @@
 /obj/item/smithing/axehead/startfinish()
 	var/obj/item/twohanded/smithed/axe/finalforreal = new /obj/item/twohanded/smithed/axe(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalitem = finalforreal
 	..()
 	finalitem.force += QUALITY_MODIFIER
@@ -694,8 +698,9 @@
 /obj/item/smithing/waraxehead/startfinish()
 	var/obj/item/twohanded/smithed/axe/waraxe/finalforreal = new /obj/item/twohanded/smithed/axe/waraxe(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalitem = finalforreal
 	..()
 
@@ -708,8 +713,9 @@
 /obj/item/smithing/crusherhead/startfinish()
 	var/obj/item/twohanded/smithed/crusher/finalforreal = new /obj/item/twohanded/smithed/crusher(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalitem = finalforreal
 	..()
 
@@ -723,8 +729,9 @@
 /obj/item/smithing/spearhead/startfinish()
 	var/obj/item/twohanded/smithed/spear/finalforreal = new /obj/item/twohanded/smithed/spear(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalforreal.throwforce = finalforreal.force
 	finalitem = finalforreal
 	..()
@@ -738,8 +745,9 @@
 /obj/item/smithing/tridenthead/startfinish()
 	var/obj/item/twohanded/smithed/spear/trident/finalforreal = new /obj/item/twohanded/smithed/spear/trident(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalforreal.throwforce = finalforreal.force
 	finalitem = finalforreal
 	..()
@@ -753,8 +761,9 @@
 /obj/item/smithing/lancehead/startfinish()
 	var/obj/item/twohanded/smithed/spear/lance/finalforreal = new /obj/item/twohanded/smithed/spear/lance(src)
 	finalforreal.force += QUALITY_MODIFIER
-	finalforreal.wield_force = finalforreal.force*finalforreal.wielded_mult
-	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force, force_wielded=finalforreal.wield_force, icon_wielded="[icon_state]_wield")
+	finalforreal.force_wielded = finalforreal.force*finalforreal.wielded_mult
+	finalforreal.force_unwielded = finalforreal.force
+	finalforreal.AddComponent(/datum/component/two_handed, force_unwielded=finalforreal.force_unwielded, force_wielded=finalforreal.force_wielded, icon_wielded="[icon_state]_wield")
 	finalforreal.throwforce = finalforreal.force
 	finalitem = finalforreal
 	..()

modular_BD2/legio_invicta/code/legio_invicta.dm

@@ -591,12 +591,12 @@
 	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_recruit"
 
-/obj/item/clothing/head/helmet/f13/legion/prime
+/*/obj/item/clothing/head/helmet/f13/legion/prime
 	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
 	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
 	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
 	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
-	icon_state = "helmet_prime"
+	icon_state = "helmet_prime"*/
 
 /obj/item/clothing/head/helmet/f13/legion/explorer
 	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'