shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into BadWording

Browse Source
This commit is contained in:
Ragolution
2019-03-18 16:30:01 -04:00
committed by GitHub
parent 9cb4265675 ea37b1a172
commit 7b26e7038a
20 changed files with 108 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/advanced/revival.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/surgery_step/revive
name = "electric stimulation"
implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60)
implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/organ/cyberimp/arm/baton = 75, /obj/item/organ/cyberimp/arm/gun/taser = 60, /obj/item/gun/energy/e_gun/advtaser = 60, /obj/item/gun/energy/taser = 60)
time = 120
/datum/surgery_step/revive/tool_check(mob/user, obj/item/tool)