From 7f5e74e5d7a563071857c75e6c11c8ed04153575 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Fri, 24 Jul 2020 17:27:49 -0700 Subject: [PATCH 1/2] Fix Medbot interact --- code/modules/mob/living/bot/medbot.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index d0c63faa56..6114cc6b66 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -33,7 +33,7 @@ var/treatment_virus = "spaceacillin" var/treatment_emag = "toxin" var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds? - + // Are we tipped over? var/is_tipped = FALSE //How panicked we are about being tipped over (why would you do this?) @@ -71,7 +71,7 @@ /mob/living/bot/medbot/handleAdjacentTarget() if(is_tipped) // Don't handle targets if we're incapacitated! return - + UnarmedAttack(target) /mob/living/bot/medbot/handlePanic() // Speed modification based on alert level. @@ -209,8 +209,8 @@ if(do_after(H, 3 SECONDS, target=src)) set_right(H) else - interact() - + interact(H) + /mob/living/bot/medbot/proc/interact(mob/user) var/dat dat += "Automatic Medical Unit v1.0

" @@ -349,14 +349,14 @@ s.start() qdel(src) return - + /mob/living/bot/medbot/handleRegular() . = ..() - + if(is_tipped) handle_panic() return - + /mob/living/bot/medbot/proc/tip_over(mob/user) playsound(src, 'sound/machines/warning-buzzer.ogg', 50) user.visible_message("[user] tips over [src]!", "You tip [src] over!") @@ -562,7 +562,7 @@ S.name = created_name user.drop_from_inventory(src) qdel(src) - + // Undefine these. #undef MEDBOT_PANIC_NONE #undef MEDBOT_PANIC_LOW From a90466daba750192640e32491f37fa2ba21f8338 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sat, 25 Jul 2020 22:10:48 -0700 Subject: [PATCH 2/2] Fix Ventcrawl bug that lets people permatrap anyone or anything in a vent. --- code/modules/ventcrawl/ventcrawl.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 0183da53ed..d8b495056a 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -25,6 +25,9 @@ var/list/ventcrawl_machinery = list( if(!(/mob/living/proc/ventcrawl in verbs)) to_chat(src, "You don't possess the ability to ventcrawl!") return FALSE + if(pulling) + to_chat(src, "You cannot bring \the [pulling] into the vent with you!") + return FALSE if(incapacitated()) to_chat(src, "You cannot ventcrawl in your current state!") return FALSE