cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes borg slime baton sprite and enables shield on peacekeeper (#10482)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-20 16:09:17 -07:00
committed by GitHub
parent 03374077b1
commit 58833573b7
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/silicon/robot/sprites/gooborgs.dm
View File

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

10
code/modules/projectiles/guns/energy/cyborg.dm
View File

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