From dc47c9d62b3ec579bcde806f2e2f2339780a1da5 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Mon, 2 Jul 2018 14:40:03 -0400 Subject: [PATCH 1/3] IT burnnnns --- code/modules/mob/living/silicon/ai/ai.dm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 09b62f1c89c..72c0a7b63be 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1239,4 +1239,16 @@ var/list/ai_verbs_default = list( to_chat(src, "Unable to locate an airlock near [target].") else - to_chat(src, "Target is not on or near any active cameras on the station.") \ No newline at end of file + to_chat(src, "Target is not on or near any active cameras on the station.") + +/mob/living/silicon/ai/handle_fire() + return + +/mob/living/silicon/ai/update_fire() + return + +/mob/living/silicon/ai/IgniteMob() + return 0 + +/mob/living/silicon/ai/ExtinguishMob() + return From 7fafde8102910cac314b18fa6b4b79731cc36b90 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Mon, 2 Jul 2018 15:32:41 -0400 Subject: [PATCH 2/3] Update ai.dm --- code/modules/mob/living/silicon/ai/ai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 72c0a7b63be..715a962c905 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1248,7 +1248,7 @@ var/list/ai_verbs_default = list( return /mob/living/silicon/ai/IgniteMob() - return 0 + return FALSE /mob/living/silicon/ai/ExtinguishMob() return From c391e4d82355dff02c865a230aa0adb76c896b21 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Mon, 2 Jul 2018 15:37:14 -0400 Subject: [PATCH 3/3] you want those true and false? --- .../mob/living/simple_animal/simple_animal.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index c7b82dc44b8..57fe64f3265 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -130,8 +130,8 @@ if(..()) //alive if(health < 1) death() - return 0 - return 1 + return FALSE + return TRUE /mob/living/simple_animal/proc/handle_automated_action() return @@ -270,7 +270,7 @@ if((Proj.damage_type != STAMINA)) adjustBruteLoss(Proj.damage) Proj.on_hit(src, 0) - return 0 + return FALSE /mob/living/simple_animal/attackby(obj/item/O, mob/living/user) if(can_collar && !collar && istype(O, /obj/item/clothing/accessory/petcollar)) @@ -342,7 +342,7 @@ /mob/living/simple_animal/proc/adjustHealth(amount) if(status_flags & GODMODE) - return 0 + return FALSE bruteloss = Clamp(bruteloss + amount, 0, maxHealth) handle_regular_status_updates() @@ -372,20 +372,20 @@ /mob/living/simple_animal/proc/CanAttack(var/atom/the_target) if(see_invisible < the_target.invisibility) - return 0 + return FALSE if(isliving(the_target)) var/mob/living/L = the_target if(L.stat != CONSCIOUS) - return 0 + return FALSE if(istype(the_target, /obj/mecha)) var/obj/mecha/M = the_target if(M.occupant) - return 0 + return FALSE if(istype(the_target,/obj/spacepod)) var/obj/spacepod/S = the_target if(S.pilot) - return 0 - return 1 + return FALSE + return TRUE /mob/living/simple_animal/handle_fire() return @@ -394,7 +394,7 @@ return /mob/living/simple_animal/IgniteMob() - return 0 + return FALSE /mob/living/simple_animal/ExtinguishMob() return @@ -502,19 +502,19 @@ switch(slot) if(slot_collar) if(collar) - return 0 + return FALSE if(!can_collar) - return 0 + return FALSE if(!istype(I, /obj/item/clothing/accessory/petcollar)) - return 0 - return 1 + return FALSE + return TRUE /mob/living/simple_animal/equip_to_slot(obj/item/W, slot) if(!istype(W)) - return 0 + return FALSE if(!slot) - return 0 + return FALSE W.forceMove(src) W.equipped(src, slot)