cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes player controlled cleanbots not being able to kill mice and cockroaches [MDB IGNORE] (#15496)

Browse Source 
* Fixes player controlled cleanbots not being able to kill mice and cockroaches

* Update cleanbot.dm

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-08-17 15:53:43 +01:00
committed by GitHub
co-authored by ShizCalev Tom
parent 7f08a1e1e2
commit d408e9792a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/cleanbot.dm
+7 -5
View File
@@ -99,14 +99,16 @@
bot_mode_flags = ~(BOT_MODE_ON | BOT_MODE_REMOTE_ENABLED)
/mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/W, mob/user)
if(in_range(src, user))
to_chat(user, span_notice("You attach \the [W] to \the [src]."))
user.transferItemToLoc(W, src)
if(in_range(src, user) && user.transferItemToLoc(W, src))
balloon_alert(user, "attached")
weapon = W
weapon_orig_force = weapon.force
if(!(bot_cover_flags & BOT_COVER_EMAGGED))
weapon.force = weapon.force / 2
add_overlay(image(icon=weapon.lefthand_file,icon_state=weapon.inhand_icon_state))
return TRUE
balloon_alert(user, "couldn't attach!")
return FALSE
/mob/living/simple_animal/bot/cleanbot/proc/update_titles()
var/working_title = ""
@@ -365,11 +367,11 @@
A.acid_act(75, 10)
target = null
else if(istype(A, /mob/living/basic/cockroach) || istype(A, /mob/living/simple_animal/mouse))
var/mob/living/living_target = target
var/mob/living/living_target = A
if(!living_target.stat)
visible_message(span_danger("[src] smashes [living_target] with its mop!"))
living_target.death()
living_target = null
target = null
else if(bot_cover_flags & BOT_COVER_EMAGGED) //Emag functions
if(istype(A, /mob/living/carbon))