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

Runtime errors were spotted in logs, please respond to svn if you can fix it.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1447 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-15 09:26:36 +00:00
parent b58e465bbe
commit 7707d5a58e
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/guns_ammo.dm
+30 -17
View File
@@ -442,17 +442,26 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
return
/obj/item/weapon/gun/detectiverevolver/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob, flag)
var/detective = ((istype(user:w_uniform, /obj/item/clothing/under/det) || !istype(user, /mob/living/carbon/human)) && istype(user:head, /obj/item/clothing/head/det_hat) && istype(user:wear_suit, /obj/item/clothing/suit/det_suit))
if (flag)
return
if ((istype(user, /mob/living/carbon/monkey)) && ticker.mode != "monkey")
usr << "\red You don't have the dexterity to do this!"
return
var/detective = 0
if (istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && \
istype(H.head, /obj/item/clothing/head/det_hat) && \
istype(H.wear_suit, /obj/item/clothing/suit/det_suit))
else if (istype(user, /mob/living/carbon/monkey))
if (ticker.mode != "monkey")
user << "\red You don't have the dexterity to do this!"
return
detective = 1
if(!detective)
usr << "\red You just don't feel cool enough to use this gun looking like that."
return
src.add_fingerprint(user)
if (src.bullets < 1)
user.show_message("\red *click* *click*", 2)
@@ -487,19 +496,23 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
return
/obj/item/weapon/gun/detectiverevolver/attack(mob/M as mob, mob/living/user as mob)
src.add_fingerprint(user)
var/mob/living/carbon/human/H = user
var/detective
if(!istype(H))
detective = 0
else
detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && istype(H.head, /obj/item/clothing/head/det_hat) && istype(H.wear_suit, /obj/item/clothing/suit/det_suit))
// ******* Check
var/detective = 0
if (istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && \
istype(H.head, /obj/item/clothing/head/det_hat) && \
istype(H.wear_suit, /obj/item/clothing/suit/det_suit))
else if (istype(user, /mob/living/carbon/monkey))
if (ticker.mode != "monkey")
user << "\red You don't have the dexterity to do this!"
return
detective = 1
if(!detective)
usr << "\red You just don't feel cool enough to use this gun looking like that."
user << "\red You just don't feel cool enough to use this gun looking like that."
return
src.add_fingerprint(user)
..()
/*
if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))