Mooaar fixeees

2019-12-14 01:01:38 +02:00
parent 488c0f1833
commit 9faf3d1dac
32 changed files with 171 additions and 137 deletions
@@ -27,6 +27,7 @@
 	unsuitable_atmos_damage = 0
 	minbodytemp = 0
 	maxbodytemp = 100000
+	blood_volume = 0

 /mob/living/simple_animal/astral/death()
 	icon_state = "shade_dead"
@@ -14,6 +14,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	maxbodytemp = INFINITY
 	minbodytemp = 0
+	blood_volume = 0
 	has_unlimited_silicon_privilege = 1
 	sentience_type = SENTIENCE_ARTIFICIAL
 	status_flags = NONE //no default canpush
@@ -33,6 +33,7 @@
 	initial_language_holder = /datum/language_holder/construct
 	deathmessage = "collapses in a shattered heap."
 	hud_type = /datum/hud/constructs
+	blood_volume = 0
 	var/list/construct_spells = list()
 	var/playstyle_string = "<span class='big bold'>You are a generic construct!</span><b> Your job is to not exist, and you should probably adminhelp this.</b>"
 	var/master = null
@@ -459,4 +460,3 @@
 			hud_used.healths.icon_state = "[icon_state]_health5"
 		else
 			hud_used.healths.icon_state = "[icon_state]_health6"
-
@@ -50,6 +50,7 @@
 	dextrous_hud_type = /datum/hud/dextrous/drone
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	see_in_dark = 7
+	blood_volume = 0
 	can_be_held = TRUE
 	held_items = list(null, null)
 	var/staticChoice = "static"
@@ -20,6 +20,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	icon_living = "magicOrange"
 	icon_dead = "magicOrange"
 	speed = 0
+	blood_volume = 0
 	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	movement_type = FLYING // Immunity to chasms and landmines, etc.
@@ -19,6 +19,7 @@
 	spacewalk = TRUE
 	stat_attack = UNCONSCIOUS
 	robust_searching = 1
+	blood_volume = 0

 	harm_intent_damage = 10
 	obj_damage = 50
@@ -42,4 +43,4 @@
 		var/mob/living/carbon/C = target
 		C.Knockdown(60)
 		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
+				"<span class='userdanger'>\The [src] knocks you down!</span>")
@@ -28,6 +28,7 @@
 	gold_core_spawnable = HOSTILE_SPAWN
 	del_on_death = 1
 	loot = list(/obj/effect/decal/cleanable/robot_debris)
+	blood_volume = 0

 	do_footstep = TRUE

@@ -30,6 +30,7 @@
 	robust_searching = TRUE
 	stat_attack = UNCONSCIOUS
 	anchored = TRUE
+	blood_volume = 0
 	var/combatant_state = SEEDLING_STATE_NEUTRAL
 	var/obj/seedling_weakpoint/weak_point
 	var/mob/living/beam_debuff_target
@@ -50,6 +50,7 @@ Difficulty: Normal
 	armour_penetration = 75
 	melee_damage_lower = 15
 	melee_damage_upper = 20
+	blood_volume = 0
 	speed = 1
 	move_to_delay = 11
 	ranged = 1
@@ -22,6 +22,7 @@
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	sentience_type = SENTIENCE_BOSS
 	layer = LARGE_MOB_LAYER
+	blood_volume = 0
 	var/doing_move_loop = FALSE
 	var/mob/living/set_target
 	var/timerid
@@ -31,6 +31,7 @@
 	movement_type = FLYING
 	pressure_resistance = 300
 	gold_core_spawnable = NO_SPAWN //too spooky for science
+	blood_volume = 0
 	var/ghost_hair_style
 	var/ghost_hair_color
 	var/mutable_appearance/ghost_hair
@@ -12,6 +12,7 @@
 	emote_see = list("rattles")
 	a_intent = INTENT_HARM
 	maxHealth = 40
+	blood_volume = 0
 	health = 40
 	speed = 1
 	harm_intent_damage = 5
@@ -18,6 +18,7 @@
 	maxHealth = 50000
 	health = 50000
 	healable = 0
+	blood_volume = 0

 	harm_intent_damage = 10
 	obj_damage = 100
@@ -13,6 +13,7 @@
 	response_disarm = "shoves"
 	response_harm = "hits"
 	speed = 0
+	blood_volume = 0
 	stat_attack = UNCONSCIOUS
 	robust_searching = 1
 	environment_smash = ENVIRONMENT_SMASH_NONE
@@ -31,6 +31,7 @@
 	loot = list(/obj/item/ectoplasm)
 	del_on_death = TRUE
 	initial_language_holder = /datum/language_holder/construct
+	blood_volume = 0

 /mob/living/simple_animal/shade/death()
 	deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
@@ -26,6 +26,7 @@
 	health = 150
 	healable = 0
 	gender = NEUTER
+	blood_volume = 0 //Until someome reworks for them to have slime jelly

 	see_in_dark = 8