Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…

…l-Station-13-RP into NSV-Endeavour-Fixes-2

code/game/click/click.dm

@@ -3,9 +3,6 @@
 	~Sayu
 */
 
-// 1 decisecond click delay (above and beyond mob/next_move)
-/mob/var/next_click = 0
-
 /*
 	Before anything else, defer these calls to a per-mobtype handler.  This allows us to
 	remove istype() spaghetti code, but requires the addition of other handler procs to simplify it.

code/game/gamemodes/cult/cultify/mob.dm

@@ -1,8 +1,3 @@
-/mob
-	//thou shall always be able to see the Geometer of Blood
-	var/image/narsimage = null
-	var/image/narglow = null
-
 /mob/proc/cultify()
 	return
 

code/game/rendering/legacy/alert.dm

@@ -1,7 +1,4 @@
 //A system to manage and display alerts on screen without needing you to do it yourself
-
-/mob/var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly
-
 /atom/movable/screen/alert/Click(location, control, params)
 	if(!usr || !usr.client)
 		return

code/game/verbs/suicide.dm

@@ -1,5 +1,3 @@
-/mob/var/suiciding = 0
-
 /mob/living/carbon/human/verb/suicide()
 	set hidden = 1
 

code/modules/admin/admin_attack_log.dm

@@ -1,8 +1,3 @@
-/mob/var/lastattacker = null
-/mob/var/lastattacked = null
-/mob/var/attack_log = list( )
-/mob/var/dialogue_log = list( )
-
 /proc/log_and_message_admins(message as text, mob/user = usr)
 	log_admin(user ? "[key_name(user)] [message]" : "[message]")
 	message_admins(user ? "[key_name_admin(user)] [message]" : "[message]")

code/modules/atmospherics/environmental/zas/airflow.dm

@@ -2,9 +2,6 @@
 Contains helper procs for airflow, handled in /connection_group.
 */
 
-/mob
-	var/tmp/last_airflow_stun = 0
-
 /mob/proc/airflow_stun()
 	if(stat == 2)
 		return 0

code/modules/catalogue/atoms.dm

@@ -5,8 +5,6 @@
 	// Also you should use get_catalogue_data() to access this instead of doing so directly, so special behavior can be enabled.
 	var/list/catalogue_data = null
 
-/mob
-	catalogue_delay = 10 SECONDS
 
 // Tests if something can be catalogued.
 // If something goes wrong and a mob was supplied, the mob will be told why they can't catalogue it.

code/modules/detectivework/tools/rag.dm

@@ -1,11 +1,3 @@
-/mob
-	var/bloody_hands = 0
-	var/mob/living/carbon/human/bloody_hands_mob
-	var/track_blood = 0
-	var/list/feet_blood_DNA
-	var/track_blood_type
-	var/feet_blood_color
-
 /obj/item/clothing/gloves
 	var/transfer_blood = 0
 	var/mob/living/carbon/human/bloody_hands_mob

code/modules/integrated_electronics/core/printer.dm

@@ -296,7 +296,8 @@
 				program = null
 				return
 			if(istext(new_input))
-				to_chat(usr, SPAN_NOTICE("[new_input] load blueprint pressed"))
+				to_chat(usr, SPAN_NOTICE("[new_input]"))
+				to_chat(usr, SPAN_NOTICE("Load blueprint pressed"))
 			log_game("[usr] cloned circuit [new_input]")
 			var/validation = SScircuit.validate_electronic_assembly(new_input)
 			// Validation error codes are returned as text.

code/modules/integrated_electronics/core/saved_circuits.dm

@@ -257,7 +257,7 @@
 	var/assembly_path = all_assemblies[assembly_params["type"]]
 	var/obj/item/electronic_assembly/assembly = cached_assemblies[assembly_path]
 	if(!assembly)
-		return "Invalid assembly type."
+		return "Invalid assembly type: \"[assembly_params["type"]]\"."
 
 	// Make sure the container is supposed to have that type of assembly.
 	if(possible_container)
@@ -295,7 +295,7 @@
 		var/component_path = all_components[component_params["type"]]
 		var/obj/item/integrated_circuit/component = cached_components[component_path]
 		if(!component)
-			return "Invalid component type."
+			return "Invalid component type: \"[component_params["type"]]\"."
 
 		// Add temporary component to assembly_components list, to be used later when verifying the wires
 		assembly_components.Add(component)

code/modules/keybindings/focus.dm

@@ -1,9 +1,3 @@
-/mob
-	/// What receives our keyboard inputs, defaulting to src.
-	var/datum/key_focus
-	/// a singular thing that can intercept keyboard inputs
-	var/datum/key_intercept
-
 /**
  * set our keyboard input focus
  */

code/modules/mob/animations.dm

@@ -8,9 +8,6 @@ value of dizziness ranges from 0 to 1000
 below 100 is not dizzy
 */
 
-/mob/var/dizziness = 0//Carbon
-/mob/var/is_dizzy = 0
-
 /mob/proc/make_dizzy(var/amount)
 	// for the moment, only humans get dizzy
 	if(!istype(src, /mob/living/carbon/human))
@@ -43,9 +40,6 @@ note dizziness decrements automatically in the mob's Life() proc.
 		client.pixel_x = 0
 		client.pixel_y = 0
 
-// jitteriness - copy+paste of dizziness
-/mob/var/is_jittery = 0
-/mob/var/jitteriness = 0//Carbon
 /mob/proc/make_jittery(var/amount)
 	if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy
 		return
@@ -57,29 +51,20 @@ note dizziness decrements automatically in the mob's Life() proc.
 			jittery_process()
 
 
-// Typo from the oriignal coder here, below lies the jitteriness process. So make of his code what you will, the previous comment here was just a copypaste of the above.
 /mob/proc/jittery_process()
-	//var/old_x = pixel_x
-	//var/old_y = pixel_y
+	if(IS_DEAD(src))//Dead people dont twitch around
+		return
+
 	is_jittery = 1
 	while(jitteriness > 100)
-//		var/amplitude = jitteriness*(sin(jitteriness * 0.044 * world.time) + 1) / 70
-//		pixel_x = amplitude * sin(0.008 * jitteriness * world.time)
-//		pixel_y = amplitude * cos(0.008 * jitteriness * world.time)
-
 		var/amplitude = min(4, jitteriness / 100)
 		pixel_x = get_managed_pixel_x() + rand(-amplitude, amplitude)
 		pixel_y = get_managed_pixel_y()  + rand(-amplitude/3, amplitude/3)
 
 		sleep(1)
-	//endwhile - reset the pixel offsets to zero
 	is_jittery = 0
 	reset_pixel_offsets()
 
-//handles up-down floaty effect in space and zero-gravity
-/mob/var/is_floating = 0
-/mob/var/floatiness = 0
-
 /mob/proc/update_floating(dense_object=0)
 
 	if(anchored||buckled)
@@ -207,30 +192,6 @@ note dizziness decrements automatically in the mob's Life() proc.
 
 /atom/movable/proc/do_attack_animation(atom/A)
 	animate_swing_at_target(A)
-	// var/pixel_x_diff = 0
-	// var/pixel_y_diff = 0
-	// var/direction = get_dir(src, A)
-	// if(direction & NORTH)
-	// 	pixel_y_diff = 8
-	// else if(direction & SOUTH)
-	// 	pixel_y_diff = -8
-
-	// if(direction & EAST)
-	// 	pixel_x_diff = 8
-	// else if(direction & WEST)
-	// 	pixel_x_diff = -8
-
-	// var/base_pixel_x = initial(pixel_x)
-	// var/base_pixel_y = initial(pixel_y)
-	// var/mob/mob = src
-	// if(istype(mob))
-	// 	base_pixel_x = mob.base_pixel_x
-	// 	base_pixel_y = mob.base_pixel_y
-
-	// SEND_SIGNAL(src, COMSIG_ATOM_TEMPORARY_ANIMATION_START, 4)
-
-	// animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
-	// animate(pixel_x = base_pixel_x, pixel_y = base_pixel_y, time = 2)
 
 /mob/living/do_attack_animation(atom/A, no_attack_icons = FALSE)
 	..()
@@ -241,69 +202,6 @@ note dizziness decrements automatically in the mob's Life() proc.
 		A.animate_hit_by_weapon(src, held)
 	else
 		A.animate_hit_by_attack(src)
-	// if(no_attack_icons)
-	// 	return FALSE
-
-	// //Check for clients with pref enabled
-	// var/list/viewing = list()
-	// for(var/m in viewers(A))
-	// 	var/mob/M = m
-	// 	var/client/C = M.client
-	// 	if(C && C.get_preference_toggle(/datum/client_preference/attack_icons))
-	// 		viewing += M.client
-
-	// //Animals attacking each other in the distance, probably. Forgeddaboutit.
-	// if(!viewing.len)
-	// 	return FALSE
-
-	// // What icon do we use for the attack?
-	// var/obj/used_item
-	// if(hand && l_hand) // Attacked with item in left hand.
-	// 	used_item = l_hand
-	// else if (!hand && r_hand) // Attacked with item in right hand.
-	// 	used_item = r_hand
-
-	// //Couldn't find an item, do they have a sprite specified (like animal claw stuff?)
-	// if(!used_item && !(attack_icon && attack_icon_state))
-	// 	return FALSE //Didn't find an item, not doing animation.
-
-	// // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
-	// is_floating = 0
-
-	// var/image/I
-
-	// if(used_item) //Found an in-hand item to animate
-	// 	I = image(used_item.icon, A, used_item.icon_state, A.layer + 1)
-	// 	//Color the icon
-	// 	I.color = used_item.color
-	// 	// Scale the icon.
-	// 	I.transform *= 0.75
-	// else //They had a hardcoded one specified
-	// 	I = image(attack_icon, A, attack_icon_state, A.layer + 1)
-	// 	I.dir = dir
-
-	// // Show the overlay to the clients
-	// flick_overlay(I, viewing, 5) // 5 ticks/half a second
-
-	// // Set the direction of the icon animation.
-	// var/direction = get_dir(src, A)
-	// if(direction & NORTH)
-	// 	I.pixel_y = -16
-	// else if(direction & SOUTH)
-	// 	I.pixel_y = 16
-
-	// if(direction & EAST)
-	// 	I.pixel_x = -16
-	// else if(direction & WEST)
-	// 	I.pixel_x = 16
-
-	// if(!direction) // Attacked self?!
-	// 	I.pixel_z = 16
-
-	// // And animate the attack!
-	// animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
-	// update_icon()
-	// return TRUE //Found an item, doing item attack animation.
 
 /mob/proc/spin(spintime, speed)
 	if(speed < world.tick_lag)

code/modules/mob/freelook/eye.dm

@@ -80,9 +80,6 @@
 	// we see everything by default
 	P.SetSight(SEE_TURFS | SEE_MOBS | SEE_OBJS)
 
-/mob
-	var/mob/observer/eye/eyeobj
-
 /mob/proc/EyeMove(n, direct)
 	if(!eyeobj)
 		return

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

@@ -1,11 +1,6 @@
 /mob/proc/flash_pain()
 	flick("pain",pain)
 
-/mob/var/list/pain_stored = list()
-/mob/var/last_pain_message = ""
-/mob/var/next_pain_time = 0
-
-
 /mob/living/proc/custom_pain(message, power, force)
 
 // message is the custom message to be displayed

code/modules/mob/living/simple_mob/subtypes/animal/xenomorph/xenomorph.dm

@@ -9,6 +9,7 @@
 	attack_edge = TRUE
 	attacktext = list("slashed")
 	attack_sound = 'sound/weapons/bladeslice.ogg'
+	meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
 
 /mob/living/simple_mob/animal/space/xenomorph/breaker/death()
 	..()

code/modules/mob/living/simple_mob/subtypes/occult/constructs/nuclear/demoncore.dm

@@ -27,10 +27,19 @@
 
 	ai_holder_type = /datum/ai_holder/polaris/simple_mob/melee/evasive
 
+	armor_legacy_mob = list(
+				"melee" = 70,
+				"bullet" = 30,
+				"laser" = 30,
+				"energy" = 30,
+				"bomb" = 10,
+				"bio" = 100,
+				"rad" = 100)
+
 /mob/living/simple_mob/construct/nuclear/demoncore/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/horror_aura)
-	AddComponent(/datum/component/radioactive, 1000 , 0, TRUE, RAD_FALLOFF_CONTAMINATION_NORMAL)
+	AddComponent(/datum/component/radioactive, 1250 , 0, TRUE, RAD_FALLOFF_CONTAMINATION_NORMAL)
 
 /mob/living/simple_mob/construct/nuclear/demoncore/handle_light()
 	. = ..()

code/modules/mob/living/simple_mob/subtypes/occult/constructs/nuclear/gammawraith.dm

@@ -34,7 +34,7 @@
 	projectiletype = /obj/projectile/beam/gamma
 	projectilesound = 'sound/items/geiger/ext3.ogg'
 
-	base_attack_cooldown = 30 //As the projectile is AP Hitscan it fires relatively slowly
+	base_attack_cooldown = 7.5 //The damage is so low it needs to fire fast to actually be effective at killing anything
 	ai_holder_type = /datum/ai_holder/polaris/simple_mob/ranged
 
 /datum/category_item/catalogue/fauna/nuclear_spirits/gammawraith
@@ -46,7 +46,7 @@
 /mob/living/simple_mob/construct/nuclear/gammawraith/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/horror_aura)
-	AddComponent(/datum/component/radioactive, 500 , 0, TRUE, RAD_FALLOFF_CONTAMINATION_NORMAL)
+	AddComponent(/datum/component/radioactive, 750 , 0, TRUE, RAD_FALLOFF_CONTAMINATION_NORMAL)
 
 /mob/living/simple_mob/construct/nuclear/gammawraith/handle_light()
 	. = ..()

code/modules/mob/mob_defines.dm

@@ -388,3 +388,63 @@
 	//? Movement
 	/// Is self-moving.
 	var/in_selfmove
+
+	var/is_jittery = 0
+	var/jitteriness = 0
+
+	//handles up-down floaty effect in space and zero-gravity
+	var/is_floating = 0
+	var/floatiness = 0
+
+	var/dizziness = 0
+	var/is_dizzy = 0
+
+	// used when venting rooms
+	var/tmp/last_airflow_stun = 0
+
+	catalogue_delay = 10 SECONDS
+
+	var/mob/observer/eye/eyeobj
+
+	//thou shall always be able to see the Geometer of Blood
+	var/image/narsimage = null
+	var/image/narglow = null
+
+	//Moved from code\modules\detectivework\tools\rag.dm
+	var/bloody_hands = 0
+	var/mob/living/carbon/human/bloody_hands_mob
+	var/track_blood = 0
+	var/list/feet_blood_DNA
+	var/track_blood_type
+	var/feet_blood_color
+
+	//Moved from code\modules\keybindings\focus.dm
+	/// What receives our keyboard inputs, defaulting to src.
+	var/datum/key_focus
+	/// a singular thing that can intercept keyboard inputs
+	var/datum/key_intercept
+
+	//Moved from code\game\click\click.dm
+	// 1 decisecond click delay (above and beyond mob/next_move)
+	var/next_click = 0
+
+	//Moved from code\game\rendering\legacy\alert.dm
+	var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly
+
+	//Moved from code\game\verbs\suicide.dm
+	var/suiciding = 0
+
+	//Moved from code\modules\admin\admin_attack_log.dm
+	var/lastattacker = null
+	var/lastattacked = null
+	var/attack_log = list( )
+	var/dialogue_log = list( )
+
+	//Moved from code\modules\mob\living\carbon\human\pain.dm
+	var/list/pain_stored = list()
+	var/last_pain_message = ""
+	var/next_pain_time = 0
+
+	//Moved from code\modules\nano\nanoexternal.dm
+	// Used by the Nano UI Manager (/datum/nanomanager) to track UIs opened by this mob
+	var/list/open_uis = list()