From 1aaaf3b1889ac9ecfe400c86d558e7cfeaf559ab Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Thu, 20 Mar 2025 11:11:55 -0400 Subject: [PATCH] Fixes borg slime baton sprite and enables shield on peacekeeper (#17367) * Fixes borg slime baton sprite and enables shield on peacekeeper * Update cyborg.dm --- .../mob/living/silicon/robot/sprites/gooborgs.dm | 2 +- code/modules/projectiles/guns/energy/cyborg.dm | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/sprites/gooborgs.dm b/code/modules/mob/living/silicon/robot/sprites/gooborgs.dm index e194c4a99ba..07b09257c30 100644 --- a/code/modules/mob/living/silicon/robot/sprites/gooborgs.dm +++ b/code/modules/mob/living/silicon/robot/sprites/gooborgs.dm @@ -174,7 +174,7 @@ sprite_icon = 'icons/mob/robot/gooborgs/departmental/gooborg_peacekeeper.dmi' rest_sprite_options = list("Default", "Bellyup", "Sit") belly_capacity_list = list("sleeper" = 2, "throat" =2) - sprite_flags = ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_MELEE_SPRITE //Baton + sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_MELEE_SPRITE //Baton module_type = "Combat" icon_y = 64 vis_height = 64 diff --git a/code/modules/projectiles/guns/energy/cyborg.dm b/code/modules/projectiles/guns/energy/cyborg.dm index 99e983fdd59..8e9206e0ec4 100644 --- a/code/modules/projectiles/guns/energy/cyborg.dm +++ b/code/modules/projectiles/guns/energy/cyborg.dm @@ -447,7 +447,15 @@ target.taunt(user) /obj/item/melee/robotic/baton/slime - hitcost = 200 + name = "slimebaton" + desc = "A modified stun baton designed to stun slimes and other lesser slimy xeno lifeforms for handling." + icon_state = "slimebaton_active" + item_state = "slimebaton" + force = 10 //we like round numbers here + lightcolor = "#33CCFF" + agonyforce = 10 //It's not supposed to be great at stunning human beings. + hitcost = 48 //Less zap for less cost + /obj/item/melee/robotic/baton/slime/attack(mob/living/L, mob/user, hit_zone) if(!istype(L))