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

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

@@ -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>"

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