diff --git a/_maps/map_files/MetaStation/MetaStation.v40D.dmm b/_maps/map_files/MetaStation/MetaStation.v40D.dmm
index 16cb900b63b..328d3e8e007 100644
--- a/_maps/map_files/MetaStation/MetaStation.v40D.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.v40D.dmm
@@ -362,7 +362,7 @@
"agX" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos)
"agY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/fancy/carpet,/area/security/hos)
"agZ" = (/obj/machinery/hologram/holopad,/obj/structure/stool/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Head of Security"},/turf/simulated/floor/fancy/carpet,/area/security/hos)
-"aha" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/hostile/retaliate/bat{desc = "A fierce companion for any person of power, this spider has been carefully trained by NanoTrasen specialists. Its beady, staring eyes send shivers down your spine"; emote_hear = list("chitters"); faction = "spiders"; harm_intent_damage = 3; health = 200; icon_dead = "guard_dead"; icon_gib = "guard_dead"; icon_living = "guard"; icon_state = "guard"; l_move_time = 1; max_co2 = 5; max_tox = 2; maxHealth = 250; melee_damage_lower = 15; melee_damage_upper = 20; min_oxy = 5; name = "Sergeant Araneus"; real_name = "Sergeant Araneus"; response_help = "pets"; turns_per_move = 10; voice_name = "unidentifiable voice"},/turf/simulated/floor/fancy/carpet,/area/security/hos)
+"aha" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/hostile/retaliate/bat{desc = "A fierce companion for any person of power, this spider has been carefully trained by NanoTrasen specialists. Its beady, staring eyes send shivers down your spine"; emote_hear = list("chitters"); faction = "spiders"; harm_intent_damage = 3; health = 200; icon_dead = "guard_dead"; icon_gib = "guard_dead"; icon_living = "guard"; icon_state = "guard"; max_co2 = 5; max_tox = 2; maxHealth = 250; melee_damage_lower = 15; melee_damage_upper = 20; min_oxy = 5; name = "Sergeant Araneus"; real_name = "Sergeant Araneus"; response_help = "pets"; turns_per_move = 10; voice_name = "unidentifiable voice"},/turf/simulated/floor/fancy/carpet,/area/security/hos)
"ahb" = (/obj/structure/table/wood,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 0},/obj/item/device/radio/off{pixel_x = 0; pixel_y = 3},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos)
"ahc" = (/obj/machinery/door/firedoor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/command{name = "Head of Security's Office"; req_access = null; req_access_txt = "58"},/turf/simulated/floor/fancy/carpet,/area/security/hos)
"ahd" = (/turf/simulated/floor/plasteel,/area/security/range)
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 45de5f82b5d..ca29b09f718 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -75,6 +75,11 @@
#define NO_DEXTERY 1 //if other mobs (monkeys, aliens, etc) can use this
//used by canUseTopic()
+//Sizes of mobs, used by mob/living/var/mob_size
+#define MOB_SIZE_SMALL 1
+#define MOB_SIZE_HUMAN 2
+#define MOB_SIZE_LARGE 3
+
//singularity defines
#define STAGE_ONE 1
#define STAGE_TWO 3
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f21f383e69b..66d22ff71b1 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -126,8 +126,6 @@
W.afterattack(A,src,0,params) // 0: not Adjacent
else
RangedAttack(A, params)
- last_movement=world.time
- return
/mob/proc/changeNext_move(num)
next_move = world.time + num
diff --git a/code/datums/goon_mutations_powers.dm b/code/datums/goon_mutations_powers.dm
index e164eced752..a2e64ff37ee 100644
--- a/code/datums/goon_mutations_powers.dm
+++ b/code/datums/goon_mutations_powers.dm
@@ -28,11 +28,12 @@
text_gain_indication = "You feel one with your surroundings."
text_lose_indication = "You feel oddly exposed."
var/last_location
+
/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
if(owner.loc != last_location)
owner.alpha = round(255 * 0.80)
last_location = owner.loc
- if((world.time - owner.last_movement) >= 30 && !owner.stat && owner.canmove && !owner.restrained())
+ if((world.time - owner.next_move) >= 30 && !owner.stat && owner.canmove && !owner.restrained())
owner.alpha -= 25
else
owner.alpha = round(255 * 0.80)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b50eebcb180..cc8f14c2573 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -2,8 +2,6 @@
layer = 3
var/last_move = null
var/anchored = 0
- var/move_speed = 10
- var/l_move_time = 1
var/throwing = 0
var/throw_speed = 2
var/throw_range = 7
@@ -50,8 +48,6 @@
return
last_move = direct
- src.move_speed = world.timeofday - src.l_move_time
- src.l_move_time = world.timeofday
spawn(5) // Causes space drifting. /tg/station has no concept of speed, we just use 5
if(loc && direct && last_move == direct)
diff --git a/code/game/dna.dm b/code/game/dna.dm
index de97e0e1b04..6a1cba35502 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -295,7 +295,7 @@
//////////////////////////////////////////////////////////// Monkey Block
if(M)
- M.update_icon = 1 //queue a full icon update at next life() call
+ M.regenerate_icons()
return 1
/////////////////////////// DNA MISC-PROCS
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index d3a367e5e64..8950e4c2f33 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -152,7 +152,7 @@
maxbodytemp = 360
force_threshold = 10
environment_smash = 3
- mob_size = 2
+ mob_size = MOB_SIZE_LARGE
/mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget()
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 6450218c3d8..0fae4cdfa6e 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -111,4 +111,4 @@
foldedbag_path = /obj/item/bodybag/bluespace
density = 0
mob_storage_capacity = 15
- max_mob_size = 2
\ No newline at end of file
+ max_mob_size = MOB_SIZE_LARGE
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 7f91e9f022a..5709612e257 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -14,7 +14,7 @@
var/wall_mounted = 0 //never solid (You can always pass over it)
var/health = 100
var/lastbang
- var/max_mob_size = 1 //Biggest mob_size accepted by the container
+ var/max_mob_size = MOB_SIZE_HUMAN //Biggest mob_size accepted by the container
var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate
//then open it in a populated area to crash clients.
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 533213efd98..07395b77e10 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -42,8 +42,7 @@
/obj/item/device/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
if (istype(AM, /obj/effect/beam)) return
- if (AM.move_speed < 12) sense()
- return
+ sense()
/obj/item/device/assembly/prox_sensor/sense()
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 013051ca169..1cd79aff95d 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -12,7 +12,7 @@
faction = list("alien")
ventcrawler = 2
languages = ALIEN
- nightvision = 1
+ var/nightvision = 1
var/storedPlasma = 250
var/max_plasma = 500
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 50f8ed4b4a1..3734ea7ea07 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -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()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index a42e347ac21..e1aae3cc6e2 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 6bdcbb4307d..9a01954a6d9 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 6387d02ec46..e2621c4c839 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 6519cd2b39a..0a69677e001 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -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 << "Your mask protects you from the acid."
return
- if(!unacidable)
- take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
+ take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 50a4d58086c..4d50dd3e1a8 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -16,7 +16,6 @@
health = 150
gender = NEUTER
- update_icon = 0
nutrition = 700
see_in_dark = 8
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 812d9705c4f..aedc993e895 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -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)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index e1f88b45cb0..f949030014d 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -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()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 8962f12e241..8e0c98192a7 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 2f515596d37..59f3d664c1a 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -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 = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index ee9bdc720ac..e4f9e562e37 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -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()
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index b449ffb30bf..0725fe6a4ee 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -77,4 +77,4 @@
icon_living = "kitten"
icon_dead = "kitten_dead"
gender = NEUTER
- mob_size = 0
+ mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 6cfff764b88..175e46fe17e 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -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)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 8a70dd5e4b2..de94eec0452 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index d976a50bf86..b01d3ef8d56 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -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()
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index c9b23b18904..3e97c6d41e9 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -15,4 +15,4 @@
response_disarm = "shoos"
response_harm = "stomps on"
ventcrawler = 2
- mob_size = 0
\ No newline at end of file
+ mob_size = MOB_SIZE_SMALL
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index ae67489e9e0..c59bf21ec64 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -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()
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index b00b0c95e70..90294014e67 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index a7683dd7847..f60245b6415 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -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
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 0e62f7f61b7..062aab6e7cb 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -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()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 1173ef3418c..91284c9586a 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -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.
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 72b30675077..7d0982b9298 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -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()
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 43ee23cf49b..397c96bf695 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -14,7 +14,7 @@
speed = 1
maxHealth = 250
health = 250
- mob_size = 2
+ mob_size = MOB_SIZE_LARGE
pixel_x = -16
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index d49855fc02f..82ff3527b34 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -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
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0743fbaa710..8762927332f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -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
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 3f3581d1dc9..292206ab56b 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -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.
\ No newline at end of file
+ var/turf/listed_turf = null //the current turf being examined in the stat panel
\ No newline at end of file
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 754753b239e..1d34da24490 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -200,7 +200,6 @@
step(mob, pick(cardinal))
else
. = ..()
- mob.last_movement=world.time
moving = 0
if(mob && .)
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index 79e7cb5308b..194f7a43ef3 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -310,9 +310,8 @@ datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH,
if(!istype(C))
return
if(method != TOUCH)
- if(!C.unacidable)
- C.take_organ_damage(min(6*toxpwr, volume * toxpwr))
- return
+ C.take_organ_damage(min(6*toxpwr, volume * toxpwr))
+ return
C.acid_act(acidpwr, toxpwr, volume)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index b4d951cc78e..b7815cfad11 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -148,7 +148,7 @@
/obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user)
if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
return
- if(target.mob_size > 1)
+ if(target.mob_size > MOB_SIZE_HUMAN)
user << "[target] doesn't fit inside [src]."
return
src.add_fingerprint(user)