Merge pull request #10433 from VOREStation/upstream-merge-8085

[MIRROR] Linter Introduction + Cleanup

code/modules/mob/dead/observer/observer.dm

@@ -466,7 +466,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set_dir(2) //reset dir so the right directional sprites show up
 	return ..()
 
-/mob/observer/dead/stop_orbit(datum/component/orbiter/orbits)
+/mob/observer/dead/stop_orbit()
 	. = ..()
 	//restart our floating animation after orbit is done.
 	pixel_y = 0

code/modules/mob/dead/observer/observer_vr.dm

@@ -62,7 +62,7 @@
 	set name = "Notify Transcore"
 	set desc = "If your past-due backup notification was missed or ignored, you can use this to send a new one."
 
-	if(src.mind && src.mind.name in SStranscore.backed_up)
+	if(src.mind && (src.mind.name in SStranscore.backed_up))
 		var/datum/transhuman/mind_record/record = SStranscore.backed_up[src.mind.name]
 		if(!(record.dead_state == MR_DEAD))
 			to_chat(src, "<span class='warning'>Your backup is not past-due yet.</span>")

code/modules/mob/living/bot/mulebot.dm

@@ -242,7 +242,6 @@
 		M.apply_damage(0.5 * damage, BRUTE, BP_R_ARM)
 
 		blood_splatter(src, M, 1)
-	..()
 
 /mob/living/bot/mulebot/relaymove(var/mob/user, var/direction)
 	if(load == user)

code/modules/mob/living/carbon/brain/life.dm

@@ -219,12 +219,4 @@
 			if(client && !client.adminobs)
 				reset_view(null)
 
-	return 1
-
-	if (stat != 2)
-		if (machine)
-			if (machine.check_eye(src) < 0)
-				reset_view(null)
-		else
-			if(client && !client.adminobs)
-				reset_view(null)
+	return 1

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

@@ -151,7 +151,6 @@
 	set name = "Attach Limb"
 	set category = "Object"
 	set desc = "Attach a replacement limb."
-	set usr = src
 
 	var/obj/item/organ/external/E = get_active_hand()
 	if(!check_can_attach_modular_limb(E))
@@ -181,7 +180,6 @@
 	set name = "Remove Limb"
 	set category = "Object"
 	set desc = "Detach one of your limbs."
-	set usr = src
 
 	var/list/detachable_limbs = get_modular_limbs(return_first_found = FALSE, validate_proc = /obj/item/organ/external/proc/can_remove_modular_limb)
 	if(!length(detachable_limbs))

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

@@ -19,7 +19,7 @@
 		else
 			var/list/datum/sprite_accessory/hair/valid_hairstyles = list()
 			for(var/hair_string in hair_styles_list)
-				var/list/datum/sprite_accessory/hair/test = hair_styles_list[hair_string]
+				var/datum/sprite_accessory/hair/test = hair_styles_list[hair_string]
 				if(test.flags & HAIR_TIEABLE)
 					valid_hairstyles.Add(hair_string)
 			selected_string = input("Select a new hairstyle", "Your hairstyle", hair_style) as null|anything in valid_hairstyles

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

@@ -67,7 +67,6 @@
 /mob/living/carbon/human/proc/can_break_straight_jacket()
 	if((HULK in mutations) || species.can_shred(src,1))
 		return 1
-	return ..()
 
 /mob/living/carbon/human/proc/break_straight_jacket()
 	visible_message(

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

@@ -653,7 +653,8 @@
 			var/obj/mecha/M = loc
 			loc_temp =  M.return_temperature()
 		else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
-			loc_temp = loc:air_contents.temperature
+			var/obj/machinery/atmospherics/unary/cryo_cell/cc = loc
+			loc_temp = cc.air_contents.temperature
 		else
 			loc_temp = environment.temperature
 

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm

@@ -162,14 +162,14 @@
 	else
 		return ..()
 
-/mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount)
+/mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount,var/include_robo)
 	amount *= 1.5
 	if(humanform)
 		return humanform.adjustBruteLoss(amount)
 	else
 		return ..()
 
-/mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount)
+/mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount,var/include_robo)
 	amount *= 1.5
 	if(humanform)
 		return humanform.adjustFireLoss(amount)

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm

@@ -176,7 +176,7 @@
 	for(var/obj/item/organ/I in H.internal_organs)
 		I.removed()
 
-	for(var/obj/item/I in src)
+	for(var/obj/item/I in H.contents)
 		H.drop_from_inventory(I)
 
 	qdel(H)

code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm

@@ -145,15 +145,13 @@
 		P.old_style_target(A)
 		P.fire()
 		playsound(src, 'sound/weapons/pierce.ogg', 25, 0)
-	else
-		..()
 
 /mob/living/carbon/human/proc/corrosive_acid(O as obj|turf in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
 	set name = "Corrosive Acid (200)"
 	set desc = "Drench an object in acid, destroying it over time."
 	set category = "Abilities"
 
-	if(!O in oview(1))
+	if(!(O in oview(1)))
 		to_chat(src, "<span class='alium'>[O] is too far away.</span>")
 		return
 

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

@@ -481,7 +481,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 
 	overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ.head_offset)
 	apply_layer(HAIR_LAYER)
-	return
+	//return //VOREStation Edit
 
 	// VOREStation Edit - START
 	var/icon/hair_acc_s = get_hair_accessory_overlay()
@@ -565,7 +565,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 				standing.underlays += underlay
 
 	for(var/mut in mutations)
-		if(LASER)
+		if(mut == LASER)
 			standing.overlays += "lasereyes_s" //TODO
 
 	overlays_standing[MUTATIONS_LAYER]	= standing

code/modules/mob/living/inventory.dm

@@ -229,32 +229,33 @@
 /datum/inventory_panel/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
 	var/list/data = ..()
 
-	data["slots"] = list()
-	data["slots"].Add(list(list(
+	var/list/slots = list()
+	slots.Add(list(list(
 		"name" = "Head (Mask)",
 		"item" = host.wear_mask,
 		"act" = "mask",
 	)))
-	data["slots"].Add(list(list(
+	slots.Add(list(list(
 		"name" = "Left Hand",
 		"item" = host.l_hand,
 		"act" = "l_hand",
 	)))
-	data["slots"].Add(list(list(
+	slots.Add(list(list(
 		"name" = "Right Hand",
 		"item" = host.r_hand,
 		"act" = "r_hand",
 	)))
-	data["slots"].Add(list(list(
+	slots.Add(list(list(
 		"name" = "Back",
 		"item" = host.back,
 		"act" = "back",
 	)))
-	data["slots"].Add(list(list(
+	slots.Add(list(list(
 		"name" = "Pockets",
 		"item" = "Empty Pockets",
 		"act" = "pockets",
 	)))
+	data["slots"] = slots
 
 	data["internals"] = host.internals
 	data["internalsValid"] = istype(host.wear_mask, /obj/item/clothing/mask) && istype(host.back, /obj/item/weapon/tank)
@@ -300,33 +301,37 @@
 	if(istype(H.w_uniform, /obj/item/clothing/under))
 		suit = H.w_uniform
 
-	data["slots"] = list()
+	
+	var/list/slots = list()
 	for(var/entry in H.species.hud.gear)
 		var/list/slot_ref = H.species.hud.gear[entry]
 		if((slot_ref["slot"] in list(slot_l_store, slot_r_store)))
 			continue
 		var/obj/item/thing_in_slot = H.get_equipped_item(slot_ref["slot"])
-		data["slots"].Add(list(list(
+		slots.Add(list(list(
 			"name" = slot_ref["name"],
 			"item" = thing_in_slot,
 			"act" = "targetSlot",
 			"params" = list("slot" = slot_ref["slot"]),
 		)))
+	data["slots"] = slots
 
-	data["specialSlots"] = list()
+	
+	var/list/specialSlots = list()
 	if(H.species.hud.has_hands)
-		data["specialSlots"].Add(list(list(
+		specialSlots.Add(list(list(
 			"name" = "Left Hand",
 			"item" = H.l_hand,
 			"act" = "targetSlot",
 			"params" = list("slot" = slot_l_hand),
 		)))
-		data["specialSlots"].Add(list(list(
+		specialSlots.Add(list(list(
 			"name" = "Right Hand",
 			"item" = H.r_hand,
 			"act" = "targetSlot",
 			"params" = list("slot" = slot_r_hand),
 		)))
+	data["specialSlots"] = specialSlots
 
 	data["internals"] = H.internals
 	data["internalsValid"] = (istype(H.wear_mask, /obj/item/clothing/mask) || istype(H.head, /obj/item/clothing/head/helmet/space)) && (istype(H.back, /obj/item/weapon/tank) || istype(H.belt, /obj/item/weapon/tank) || istype(H.s_store, /obj/item/weapon/tank))

code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

@@ -22,7 +22,7 @@
 	var/decompiler = FALSE
 	var/delivery = FALSE
 	var/delivery_tag = "Fuel"
-	var/list/deliverylists = list()
+	var/list/list/deliverylists = list()
 	var/list/deliveryslot_1 = list()
 	var/list/deliveryslot_2 = list()
 	var/list/deliveryslot_3 = list()

code/modules/mob/living/silicon/robot/drone/drone_console.dm

@@ -34,7 +34,7 @@
 /obj/machinery/computer/drone_control/tgui_data(mob/user)
 	var/list/data = list()
 
-	data["drones"] = list()
+	var/list/drones = list()
 	for(var/mob/living/silicon/robot/drone/D in mob_list)
 		//VOREStation Edit - multiz lol
 		if(!(D.z in using_map.get_map_levels(z, TRUE, 0)))
@@ -42,8 +42,8 @@
 		//VOREStation Edit - multiz lol
 		if(D.foreign_droid)
 			continue
-
-		data["drones"].Add(list(list(
+				
+		drones.Add(list(list(
 			"name" = D.real_name,
 			"active" = D.stat != 2,
 			"charge" = D.cell.charge,
@@ -51,6 +51,7 @@
 			"loc" = "[get_area(D)]",
 			"ref" = "\ref[D]",
 		)))
+	data["drones"] = drones
 
 	data["fabricator"] = dronefab
 	data["fabPower"] = dronefab?.produce_drones

code/modules/mob/living/silicon/robot/inventory.dm

@@ -95,7 +95,6 @@
 		return 1
 	else
 		return 0
-	updateicon()
 
 // This one takes an object's type instead of an instance, as above.
 /mob/living/silicon/robot/proc/has_active_type(var/type_to_compare)

code/modules/mob/living/silicon/robot/robot_damage.dm

@@ -20,13 +20,13 @@
 		if(C.installed != 0) amount += C.electronics_damage
 	return amount
 
-/mob/living/silicon/robot/adjustBruteLoss(var/amount)
+/mob/living/silicon/robot/adjustBruteLoss(var/amount,var/include_robo)
 	if(amount > 0)
 		take_overall_damage(amount, 0)
 	else
 		heal_overall_damage(-amount, 0)
 
-/mob/living/silicon/robot/adjustFireLoss(var/amount)
+/mob/living/silicon/robot/adjustFireLoss(var/amount,var/include_robo)
 	if(amount > 0)
 		take_overall_damage(0, amount)
 	else

code/modules/mob/living/silicon/silicon.dm

@@ -79,7 +79,7 @@
 /mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount)
 	return	//immune
 
-/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0)
+/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0, var/def_zone = null, var/stun = 1)
 	if(shock_damage > 0)
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 		s.set_up(5, 1, loc)
@@ -113,7 +113,7 @@
 	updatehealth()
 	return 2
 
-/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)
+/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/check_protection = 1)
 	return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now
 
 
@@ -153,8 +153,22 @@
 		show_malf_ai()
 	..()
 
+/* VOREStation Removal
+// this function displays the stations manifest in a separate window
+/mob/living/silicon/proc/show_station_manifest()
+	var/dat = "<div align='center'>"
+	if(!data_core)
+		to_chat(src, "<span class='notice'>There is no data to form a manifest with. Contact your Nanotrasen administrator.</span>")
+		return
+	dat += data_core.get_manifest(1) //The 1 makes it monochrome.
+
+	var/datum/browser/popup = new(src, "Crew Manifest", "Crew Manifest", 370, 420, src)
+	popup.set_content(dat)
+	popup.open()
+*/
+
 //can't inject synths
-/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
+/mob/living/silicon/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE)
 	if(error_msg)
 		to_chat(user, "<span class='alert'>The armoured plating is too tough.</span>")
 	return 0
@@ -173,7 +187,7 @@
 	return FALSE
 
 /mob/living/silicon/add_language(var/language, var/can_speak=1)
-	var/var/datum/language/added_language = GLOB.all_languages[language]
+	var/datum/language/added_language = GLOB.all_languages[language]
 	if(!added_language)
 		return
 
@@ -183,7 +197,7 @@
 		return 1
 
 /mob/living/silicon/remove_language(var/rem_language)
-	var/var/datum/language/removed_language = GLOB.all_languages[rem_language]
+	var/datum/language/removed_language = GLOB.all_languages[rem_language]
 	if(!removed_language)
 		return
 

code/modules/mob/living/simple_mob/simple_mob_vr.dm

@@ -266,7 +266,7 @@
 	return FALSE
 
 // Checks to see if mob doesn't like this kind of turf
-/mob/living/simple_mob/IMove(newloc)
+/mob/living/simple_mob/IMove(turf/newloc, safety = TRUE)
 	if(istype(newloc,/turf/unsimulated/floor/sky))
 		return MOVEMENT_FAILED //Mobs aren't that stupid, probably
 	return ..() // Procede as normal.

code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm

@@ -43,7 +43,7 @@
 		default_pixel_y = rand(-6, 10)
 
 // Makes the AI unable to willingly go on land.
-/mob/living/simple_mob/animal/passive/fish/IMove(newloc)
+/mob/living/simple_mob/animal/passive/fish/IMove(turf/newloc, safety = TRUE)
 	if(is_type_in_list(newloc, suitable_turf_types))
 		return ..() // Procede as normal.
 	return MOVEMENT_FAILED // Don't leave the water!

code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm

@@ -139,14 +139,14 @@
 	say_list_type = /datum/say_list/possum
 	catalogue_data = list(/datum/category_item/catalogue/fauna/opossum)
 
-/mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(damage)
+/mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(var/amount,var/include_robo)
 	. = ..()
-	if(damage >= 3)
+	if(amount >= 3)
 		respond_to_damage()
 
-/mob/living/simple_mob/animal/passive/opossum/adjustFireLoss(damage)
+/mob/living/simple_mob/animal/passive/opossum/adjustFireLoss(var/amount,var/include_robo)
 	. = ..()
-	if(damage >= 3)
+	if(amount >= 3)
 		respond_to_damage()
 
 /mob/living/simple_mob/animal/passive/opossum/lay_down()

code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm

@@ -192,7 +192,7 @@
 				chemicals -= 30
 
 			if(host.getToxLoss() >= 30 && chemicals > 50)
-				var/randomchem = pickweight("tramadol" = 7, "anti_toxin" = 15, "frostoil" = 3)
+				var/randomchem = pickweight(list("tramadol" = 7, "anti_toxin" = 15, "frostoil" = 3))
 				host.reagents.add_reagent(randomchem, 5)
 				chemicals -= 50
 
@@ -330,10 +330,6 @@
 	if(!host)
 		return
 
-		if(ai_holder)
-			ai_holder.hostile = initial(ai_holder.hostile)
-			ai_holder.lose_target()
-
 	host_bodypart.implants -= src
 	host_bodypart = null
 

code/modules/mob/mob_defines.dm

@@ -170,7 +170,7 @@
 	var/mob/living/carbon/LAssailant = null
 
 //Wizard mode, but can be used in other modes thanks to the brand new "Give Spell" badmin button
-	var/spell/list/spell_list = list()
+	var/list/spell/spell_list = list()
 
 //Changlings, but can be used in other modes
 //	var/obj/effect/proc_holder/changpower/list/power_list = list()

code/modules/mob/mob_planes.dm

@@ -82,7 +82,7 @@
 	if(PM.sub_planes)
 		var/list/subplanes = PM.sub_planes
 		for(var/SP in subplanes)
-			set_vis(which = SP, new_alpha = new_alpha)
+			set_vis(which = SP, state = !!new_alpha)
 
 /datum/plane_holder/proc/set_ao(var/which = null, var/enabled = FALSE)
 	ASSERT(which)

code/modules/mob/skillset.dm

@@ -10,5 +10,3 @@
 		return 0
 	else
 		return fail_chance * 2 ** (factor*(SKILL_BASIC - points))
-
-	return FALSE // We don't actually have a skills system, so never fail.

code/modules/mob/transform_procs.dm

@@ -55,8 +55,7 @@
 	var/mob/living/silicon/ai/O = ..(move)
 	if(O)
 		O.flavor_text = O.client?.prefs?.flavor_texts["general"]
-	
-	return O
+		return O
 	//VOREStation Edit End
 
 	return ..(move)