mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 00:53:23 +01:00
Fixed some runtime errors
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1155 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -60,19 +60,22 @@
|
||||
src.attack_self(user, 1)
|
||||
return
|
||||
|
||||
/obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag)
|
||||
if ((usr.mutations & 16) && prob(50))
|
||||
/obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
|
||||
if (emp)
|
||||
|
||||
else if ((usr.mutations & 16) && prob(50))
|
||||
usr << "\red The Flash slips out of your hand."
|
||||
usr.drop_item()
|
||||
return
|
||||
else if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
|
||||
usr << "\red You don't have the dexterity to do this!"
|
||||
return
|
||||
if ( (world.time + 600) > src.l_time)
|
||||
src.shots = 5
|
||||
if (src.shots < 1)
|
||||
user.show_message("\red *click* *click*", 2)
|
||||
return
|
||||
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
|
||||
usr << "\red You don't have the dexterity to do this!"
|
||||
return
|
||||
|
||||
src.l_time = world.time
|
||||
add_fingerprint(user)
|
||||
src.shots--
|
||||
@@ -107,5 +110,5 @@
|
||||
flick("flash", M.flash)
|
||||
|
||||
/obj/item/device/flash/emp_act(severity)
|
||||
src.attack_self()
|
||||
src.attack_self(null,1,1)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user