diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 326cfe474f..a1ad1165de 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -398,8 +398,12 @@ to_chat(user, "You start fixing yourself...") if(!W.use_tool(src, user, 50)) return - - adjustBruteLoss(-30) + adjustBruteLoss(-10) + else + to_chat(user, "You start fixing [src]...") + if(!do_after(user, 30, target = src)) + return + adjustBruteLoss(-30) updatehealth() add_fingerprint(user) visible_message("[user] has fixed some of the dents on [src].") @@ -409,11 +413,16 @@ user.changeNext_move(CLICK_CD_MELEE) var/obj/item/stack/cable_coil/coil = W if (getFireLoss() > 0 || getToxLoss() > 0) - if(src == user) + if(src == user && coil.use(1)) to_chat(user, "You start fixing yourself...") if(!do_after(user, 50, target = src)) return + adjustFireLoss(-10) + adjustToxLoss(-10) if (coil.use(1)) + to_chat(user, "You start fixing [src]...") + if(!do_after(user, 30, target = src)) + return adjustFireLoss(-30) adjustToxLoss(-30) updatehealth() diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index ea0d10e67d..c53fa85262 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/screen_cyborg.dmi b/icons/mob/screen_cyborg.dmi index fc236ac7e2..7c64ace299 100644 Binary files a/icons/mob/screen_cyborg.dmi and b/icons/mob/screen_cyborg.dmi differ diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm index bcac8f8443..ebb418b3e2 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -88,7 +88,7 @@ cyborg_pixel_offset = -16 /obj/item/robot_module/scrubpup - name = "Janitor" + name = "Scrub Pup" basic_modules = list( /obj/item/dogborg/jaws/small, /obj/item/analyzer/nose, diff --git a/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm b/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm index a7ae02485b..8b8781cb02 100644 --- a/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm +++ b/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm @@ -21,10 +21,11 @@ if(M.digestable || !(digest_mode == DM_DIGEST)) // don't give digesty messages to indigestible people to_chat(M,"[pick(EL)]") +///////////////////// Prey Loop Refresh/hack ////////////////////// for(var/mob/living/M in contents) if(isbelly(M.loc)) - if(!silent) - if(world.time > M.next_preyloop) + if(world.time > M.next_preyloop) + if(!silent) M.stop_sound_channel(CHANNEL_PREYLOOP) // sanity just in case var/sound/preyloop = sound('sound/vore/prey/loop.ogg', repeat = TRUE) M.playsound_local(get_turf(src),preyloop,80,0, channel = CHANNEL_PREYLOOP)