mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 03:27:46 +01:00
fix a bunch of runtimes (#19226)
This commit is contained in:
@@ -535,10 +535,12 @@
|
||||
src.update_inv_wear_mask(0)
|
||||
|
||||
/mob/living/carbon/proc/food_preference(var/allergen_type) //RS edit
|
||||
if(!species) // carbon/brains have no species
|
||||
return FALSE
|
||||
|
||||
if(allergen_type in species.food_preference)
|
||||
return species.food_preference_bonus
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
/mob/living/carbon/handle_diseases()
|
||||
for(var/thing in GetViruses())
|
||||
|
||||
@@ -103,14 +103,14 @@
|
||||
/// This condenses them and makes it less of a cluster.
|
||||
|
||||
///Help Intent
|
||||
/mob/living/carbon/human/proc/attack_hand_help_intent(var/mob/living/carbon/human/H, var/mob/living/M as mob, var/has_hands)
|
||||
/mob/living/carbon/human/proc/attack_hand_help_intent(var/mob/living/carbon/human/H, var/mob/living/M, var/has_hands)
|
||||
PRIVATE_PROC(TRUE)
|
||||
SHOULD_NOT_OVERRIDE(TRUE)
|
||||
if(M.restrained()) //If we're restrained, we can't help them. If you want to add snowflake stuff that you can do while restrained, add it here.
|
||||
return FALSE
|
||||
if(!has_hands) //This is here so if you WANT to do special code for 'if we don't have hands, do stuff' it can be done here!
|
||||
return FALSE
|
||||
if(istype(M) && attempt_to_scoop(M) && !on_fire)
|
||||
if(istype(M) && attempt_to_scoop(M, H) && !on_fire)
|
||||
return FALSE;
|
||||
|
||||
//todo: make this whole CPR check into it's own individual proc instead of hogging up attack_hand_help_intent
|
||||
|
||||
@@ -416,6 +416,10 @@
|
||||
if(!stack_to_consolidate || !istype(stack_to_consolidate, /obj/item/stack))
|
||||
return
|
||||
|
||||
var/obj/item/current_item = get_wrapped_item()
|
||||
if(current_item?.type == stack_to_consolidate.type)
|
||||
return
|
||||
|
||||
for(var/obj/item/storage/internal/gripper/pocket in pockets)
|
||||
if(!LAZYLEN(pocket.contents))
|
||||
continue
|
||||
|
||||
@@ -169,10 +169,9 @@
|
||||
. = ..()
|
||||
if(isrobotmultibelt(loc))
|
||||
var/obj/item/robotic_multibelt/our_belt = loc
|
||||
our_belt.cut_overlays()
|
||||
if(welding)
|
||||
our_belt.add_overlay("indwelder_cyborg-on")
|
||||
else
|
||||
our_belt.cut_overlays()
|
||||
|
||||
/obj/item/tool/wirecutters/cyborg
|
||||
name = "wirecutters"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
affect_ingest(M, alien, removed)
|
||||
//VOREStation Edits Start
|
||||
if(M.isSynthetic())
|
||||
M.adjust_nutrition((nutriment_factor * removed) * M.species.synthetic_food_coeff)
|
||||
M.adjust_nutrition((nutriment_factor * removed) * M.species?.synthetic_food_coeff)
|
||||
//VOREStation Edits End
|
||||
..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user