Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

fixes cyborg stun baton passive discharge #15224

Merged
JamieD1 merged 10 commits into from
Aug 14, 2022
Merged

fixes cyborg stun baton passive discharge #15224

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad4e916
e (#14639)
Bibby0110 Jun 28, 2022
5e16af4
Squashed commit of the following:
TheRyeGuyWhoWillNowDie Aug 1, 2022
2d8146e
Merge remote-tracking branch 'origin/mastеr'
TheRyeGuyWhoWillNowDie Aug 1, 2022
4f856ef
Merge remote-tracking branch 'upstream/master'
TheRyeGuyWhoWillNowDie Aug 1, 2022
7fb014c
Update YogStation.dmm
TheRyeGuyWhoWillNowDie Aug 1, 2022
3d8124b
Merge remote-tracking branch 'upstream/master'
TheRyeGuyWhoWillNowDie Aug 5, 2022
2aa3778
Merge remote-tracking branch 'upstream/master'
TheRyeGuyWhoWillNowDie Aug 7, 2022
93fe52d
Brogging
TheRyeGuyWhoWillNowDie Aug 8, 2022
4423bdf
Update code/game/objects/items/stunbaton.dm
TheRyeGuyWhoWillNowDie Aug 8, 2022
2e1b0f4
poke turdis
TheRyeGuyWhoWillNowDie Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/game/objects/items/stunbaton.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@
if(cell)
//Note this value returned is significant, as it will determine
//if a stun is applied or not
. = cell.use(chrgdeductamt)
var/mob/living/M = loc
if(M && iscyborg(M))
var/mob/living/silicon/robot/R = loc
R.cell.use(chrgdeductamt)
else
. = cell.use(chrgdeductamt)
if(status && cell.charge < hitcost)
//we're below minimum, turn off
status = FALSE
Expand Down