From 31dfbf7fc6559224d2889e6867b5286a1469a5a6 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Tue, 1 May 2012 19:10:51 +0100 Subject: [PATCH] TG: Beepsky and ED bots no longer arrest you for posessing laser tag guns. They'll also ignore the practice laser as it deals no damage. Fixes Issue 450 Revision: r3390 Author: johnsonmt88 Date: Apr 1, 2012 --- code/game/machinery/bots/ed209bot.dm | 19 ++++++++++++++----- code/game/machinery/bots/secbot.dm | 16 +++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 8f2872dba9d..854e0898810 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -613,13 +613,22 @@ Auto Patrol: []"}, return 0 if((istype(perp.l_hand, /obj/item/weapon/gun) && !istype(perp.l_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.l_hand, /obj/item/weapon/melee/baton)) - threatcount += 4 + if(!istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 4 - if((istype(perp.r_hand, /obj/item/weapon/gun) && !istype(perp.r_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.r_hand, /obj/item/weapon/melee/baton)) - threatcount += 4 + if(istype(perp.r_hand, /obj/item/weapon/gun) || istype(perp.r_hand, /obj/item/weapon/melee)) + if(!istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 4 - if(istype(perp:belt, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee/baton)) - threatcount += 2 + if(istype(perp:belt, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee)) + if(!istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp:belt, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp:belt, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 2 if(istype(perp:wear_suit, /obj/item/clothing/suit/wizrobe)) threatcount += 2 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 61338d73778..87ae8f6be81 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -588,14 +588,24 @@ Auto Patrol: []"}, if(src.emagged) return 10 //Everyone is a criminal! if(src.idcheck && !src.allowed(perp)) + if(istype(perp.l_hand, /obj/item/weapon/gun) || istype(perp.l_hand, /obj/item/weapon/melee)) - threatcount += 4 + if(!istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 4 if(istype(perp.r_hand, /obj/item/weapon/gun) || istype(perp.r_hand, /obj/item/weapon/melee)) - threatcount += 4 + if(!istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp.r_hand, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 4 if(istype(perp:belt, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee)) - threatcount += 2 + if(!istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag) \ + && !istype(perp:belt, /obj/item/weapon/gun/energy/laser/redtag) \ + && !istype(perp:belt, /obj/item/weapon/gun/energy/laser/practice)) + threatcount += 2 if(istype(perp:wear_suit, /obj/item/clothing/suit/wizrobe)) threatcount += 2