cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives.

Browse Source
This commit is contained in:
SkyMarshal
2012-03-31 22:00:17 -07:00
parent a90173c628
commit cd4a82a90b
17 changed files with 178 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cards_ids.dm
+22 -22
View File
@@ -195,26 +195,26 @@ FINGERPRINT CARD
return "<B>There are no fingerprints on this card.</B>"
return
/obj/item/weapon/f_card/attack_hand(mob/user as mob)
///obj/item/weapon/f_card/attack_hand(mob/user as mob)
if ((user.r_hand == src || user.l_hand == src))
src.add_fingerprint(user)
var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user )
F.amount = 1
src.amount--
if (user.hand)
user.l_hand = F
else
user.r_hand = F
F.layer = 20
F.add_fingerprint(user)
if (src.amount < 1)
//SN src = null
del(src)
return
else
..()
return
// if ((user.r_hand == src || user.l_hand == src))
// add_fingerprint(user)
// var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user )
// F.amount = 1
// src.amount--
// if (user.hand)
// user.l_hand = F
// else
// user.r_hand = F
// F.layer = 20
// F.add_fingerprint(user)
// if (src.amount < 1)
// //SN src = null
// del(src)
// return
// else
// ..()
// return
/obj/item/weapon/f_card/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
@@ -253,10 +253,10 @@ FINGERPRINT CARD
..()
if (!istype(usr, /mob/living/silicon))
if (src.fingerprints)
if (fingerprints)
if (src.amount > 1)
var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card(get_turf(src))
F.amount = --src.amount
src.amount = 1
src.icon_state = "fingerprint1"
amount = 1
icon_state = "fingerprint1"
return