Merge pull request #8334 from MrPerson/cleanup_crew_comin_through

Code cleanup
2026-07-21 13:05:36 +01:00 · 2015-03-15 01:55:39 -05:00
parent ccd2c32b46 dd5e791cf7
commit da1e6f57f0
40 changed files with 39 additions and 66 deletions
@@ -12,7 +12,7 @@
 	faction = list("alien")
 	ventcrawler = 2
 	languages = ALIEN
-	nightvision = 1
+	var/nightvision = 1
 	var/storedPlasma = 250
 	var/max_plasma = 500

@@ -7,7 +7,6 @@
 	var/leap_on_click = 0
 	var/pounce_cooldown = 0
 	var/pounce_cooldown_time = 30
-	update_icon = 1

 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/humanoid/New()
@@ -74,7 +74,7 @@
 	icon = 'icons/mob/alienqueen.dmi'
 	icon_state = "queen_s"
 	pixel_x = -16
-	mob_size = 2
+	mob_size = MOB_SIZE_LARGE

 /mob/living/carbon/alien/humanoid/queen/large/update_icons()
 	update_hud()		//TODO: remove the need for this to be here
@@ -3,7 +3,7 @@
 	real_name = "alien larva"
 	icon_state = "larva0"
 	pass_flags = PASSTABLE | PASSMOB
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 	maxHealth = 25
 	health = 25
@@ -1,11 +1,3 @@
-
-/mob/living/carbon
-	var/oxygen_alert = 0
-	var/toxins_alert = 0
-	var/fire_alert = 0
-	var/pressure_alert = 0
-	var/temperature_alert = 0
-
 /mob/living/carbon/Life()
 	set invisibility = 0
 	set background = BACKGROUND_ENABLED
@@ -7,7 +7,6 @@
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	languages = MONKEY
-	update_icon = 0		///no need to call regenerate_icon
 	ventcrawler = 1

 /mob/living/carbon/monkey/New()
@@ -262,5 +261,4 @@
 			src << "<span class='warning'>Your mask protects you from the acid.</span>"
 		return

-	if(!unacidable)
-		take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
+	take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
@@ -16,7 +16,6 @@
 	health = 150
 	gender = NEUTER

-	update_icon = 0
 	nutrition = 700

 	see_in_dark = 8
@@ -138,8 +138,7 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)


 /mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
-	if(!unacidable)
-		take_organ_damage(min(10*toxpwr, acid_volume * toxpwr))
+	take_organ_damage(min(10*toxpwr, acid_volume * toxpwr))

 /mob/living/proc/grabbedby(mob/living/carbon/user)
 	if(user == src || anchored)
@@ -39,8 +39,7 @@

 	var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
 	var/floating = 0
-	var/nightvision = 0
-	var/mob_size = 1  //size of the mob. 0 is small, 1 is human sized, and 2 is large.
+	var/mob_size = MOB_SIZE_HUMAN
 	var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..

 	var/list/image/staticOverlays = list()
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/status_display.dmi' //invisibility!
 	mouse_opacity = 0
 	density = 0
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 	var/network = "SS13"
 	var/obj/machinery/camera/current = null
@@ -94,7 +94,7 @@
 	environment_smash = 2
 	attack_sound = 'sound/weapons/punch3.ogg'
 	status_flags = 0
-	mob_size = 2
+	mob_size = MOB_SIZE_SMALL
 	force_threshold = 11
 	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
 	playstyle_string = "<B>You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \
@@ -16,7 +16,7 @@
 	friendly = "nudges"
 	pass_flags = PASSTABLE
 	ventcrawler = 2
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 /mob/living/simple_animal/butterfly/New()
 	..()
@@ -77,4 +77,4 @@
 	icon_living = "kitten"
 	icon_dead = "kitten_dead"
 	gender = NEUTER
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL
@@ -468,7 +468,7 @@
 	icon_state = "puppy"
 	icon_living = "puppy"
 	icon_dead = "puppy_dead"
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 //puppies cannot wear anything.
 /mob/living/simple_animal/corgi/puppy/Topic(href, href_list)
@@ -31,7 +31,7 @@
 	gender = NEUTER
 	voice_name = "synthesized chirp"
 	languages = DRONE
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL
 	has_unlimited_silicon_privilege = 1
 	staticOverlays = list()
 	var/staticChoice = "static"
@@ -168,7 +168,7 @@
 	ventcrawler = 2
 	var/amount_grown = 0
 	pass_flags = PASSTABLE | PASSGRILLE
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 /mob/living/simple_animal/chick/New()
 	..()
@@ -15,4 +15,4 @@
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
 	ventcrawler = 2
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL
@@ -21,7 +21,7 @@
 	density = 0
 	ventcrawler = 2
 	pass_flags = PASSTABLE | PASSGRILLE
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL
 	var/body_color //brown, gray and white, leave blank for random

 /mob/living/simple_animal/mouse/New()
@@ -129,7 +129,7 @@
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400
-	mob_size = 2
+	mob_size = MOB_SIZE_LARGE

 /obj/item/projectile/neurotox
 	name = "neurotoxin"
@@ -72,7 +72,7 @@
 	maxHealth = 65
 	health = 65
 	pixel_x = -16
-	mob_size = 2
+	mob_size = MOB_SIZE_LARGE

 	melee_damage_lower = 20
 	melee_damage_upper = 20
@@ -349,7 +349,7 @@
 	aggro_vision_range = 9
 	idle_vision_range = 5
 	anchored = 1 //Stays anchored until death as to be unpullable
-	mob_size = 2
+	mob_size = MOB_SIZE_LARGE
 	var/pre_attack = 0

 /mob/living/simple_animal/hostile/asteroid/goliath/Life()
@@ -23,7 +23,7 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 	environment_smash = 0
 	ventcrawler = 2
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL


 	//Space bats need no air to fly in.
@@ -158,7 +158,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 /mob/living/simple_animal/hostile/viscerator/Die()
 	..()
@@ -14,7 +14,7 @@
 	speed = 1
 	maxHealth = 250
 	health = 250
-	mob_size = 2
+	mob_size = MOB_SIZE_LARGE

 	pixel_x = -16

@@ -54,7 +54,7 @@
 	a_intent = "harm" //parrots now start "aggressive" since only player parrots will nuzzle.
 	attacktext = "chomps"
 	friendly = "grooms"
-	mob_size = 0
+	mob_size = MOB_SIZE_SMALL

 	var/parrot_damage_upper = 10
 	var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -790,9 +790,6 @@ var/list/slot_equipment_priority = list( \
 	density = !lying
 	update_transform()
 	lying_prev = lying
-	if(update_icon) //forces a full overlay update
-		update_icon = 0
-		regenerate_icons()
 	return canmove


@@ -17,7 +17,6 @@
 	var/obj/screen/m_select = null
 	var/obj/screen/healths = null
 	var/obj/screen/throw_icon = null
-	var/obj/screen/pressure = null
 	var/obj/screen/damageoverlay = null
 	/*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob.
 	A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such.
@@ -60,7 +59,6 @@
 	var/canmove = 1
 	var/eye_stat = null//Living, potentially Carbon
 	var/lastpuke = 0
-	var/unacidable = 0

 	var/name_archive //For admin things like possession

@@ -137,7 +135,6 @@

 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER

-	var/update_icon = 1 //Set to 1 to trigger update_icons() at the next life() call

 	var/status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH	//bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc)

@@ -147,13 +144,9 @@

 	var/has_unlimited_silicon_privilege = 0 // Can they interact with station electronics

-	var/list/radar_blips = list() // list of screen objects, radar blips
-	var/radar_open = 0 	// nonzero is radar is open
-
 	var/force_compose = 0 //If this is nonzero, the mob will always compose it's own hear message instead of using the one given in the arguments.

 	var/obj/control_object //Used by admins to possess objects. All mobs should have this var
 	var/atom/movable/remote_control //Calls relaymove() to whatever it is

-	var/turf/listed_turf = null	//the current turf being examined in the stat panel
-	var/last_movement = 0 // Last world.time the mob actually moved of its own accord.
+	var/turf/listed_turf = null	//the current turf being examined in the stat panel
@@ -200,7 +200,6 @@
 			step(mob, pick(cardinal))
 		else
 			. = ..()
-		mob.last_movement=world.time

 		moving = 0
 		if(mob && .)