cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scrubbers

Browse Source
This commit is contained in:
Atermonera
2020-07-25 22:56:13 -07:00
committed by VirgoBot
parent c14a7ea7b1
commit c1638aa7b8
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/mob/living/bot/medbot.dm
View File

@@ -33,7 +33,7 @@
var/treatment_virus = "spaceacillin" var/treatment_virus = "spaceacillin"
var/treatment_emag = "toxin" var/treatment_emag = "toxin"
var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds? var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
// Are we tipped over? // Are we tipped over?
var/is_tipped = FALSE var/is_tipped = FALSE
//How panicked we are about being tipped over (why would you do this?) //How panicked we are about being tipped over (why would you do this?)
@@ -71,7 +71,7 @@
/mob/living/bot/medbot/handleAdjacentTarget() /mob/living/bot/medbot/handleAdjacentTarget()
if(is_tipped) // Don't handle targets if we're incapacitated! if(is_tipped) // Don't handle targets if we're incapacitated!
return return
UnarmedAttack(target) UnarmedAttack(target)
/mob/living/bot/medbot/handlePanic() // Speed modification based on alert level. /mob/living/bot/medbot/handlePanic() // Speed modification based on alert level.
@@ -210,7 +210,11 @@
set_right(H) set_right(H)
else else
interact(H) interact(H)
<<<<<<< HEAD
=======
>>>>>>> 21f765b... Merge pull request #7375 from Mechoid/FixScrubbers
/mob/living/bot/medbot/proc/interact(mob/user) /mob/living/bot/medbot/proc/interact(mob/user)
var/dat var/dat
dat += "<TT><B>Automatic Medical Unit v1.0</B></TT><BR><BR>" dat += "<TT><B>Automatic Medical Unit v1.0</B></TT><BR><BR>"
@@ -349,14 +353,14 @@
s.start() s.start()
qdel(src) qdel(src)
return return
/mob/living/bot/medbot/handleRegular() /mob/living/bot/medbot/handleRegular()
. = ..() . = ..()
if(is_tipped) if(is_tipped)
handle_panic() handle_panic()
return return
/mob/living/bot/medbot/proc/tip_over(mob/user) /mob/living/bot/medbot/proc/tip_over(mob/user)
playsound(src, 'sound/machines/warning-buzzer.ogg', 50) playsound(src, 'sound/machines/warning-buzzer.ogg', 50)
user.visible_message("<span class='danger'>[user] tips over [src]!</span>", "<span class='danger'>You tip [src] over!</span>") user.visible_message("<span class='danger'>[user] tips over [src]!</span>", "<span class='danger'>You tip [src] over!</span>")
@@ -562,7 +566,7 @@
S.name = created_name S.name = created_name
user.drop_from_inventory(src) user.drop_from_inventory(src)
qdel(src) qdel(src)
// Undefine these. // Undefine these.
#undef MEDBOT_PANIC_NONE #undef MEDBOT_PANIC_NONE
#undef MEDBOT_PANIC_LOW #undef MEDBOT_PANIC_LOW

3
code/modules/ventcrawl/ventcrawl.dm
View File

@@ -27,6 +27,9 @@ var/list/ventcrawl_machinery = list(
if(!(/mob/living/proc/ventcrawl in verbs)) if(!(/mob/living/proc/ventcrawl in verbs))
to_chat(src, "<span class='warning'>You don't possess the ability to ventcrawl!</span>") to_chat(src, "<span class='warning'>You don't possess the ability to ventcrawl!</span>")
return FALSE return FALSE
if(pulling)
to_chat(src, "<span class='warning'>You cannot bring \the [pulling] into the vent with you!</span>")
return FALSE
if(incapacitated()) if(incapacitated())
to_chat(src, "<span class='warning'>You cannot ventcrawl in your current state!</span>") to_chat(src, "<span class='warning'>You cannot ventcrawl in your current state!</span>")
return FALSE return FALSE