cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 12:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

batons are now blocked by riot shields, only makable via hacked autolathe

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@187 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
2010-09-27 14:03:24 +00:00
parent f163f6d332
commit 438f635c85
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/autolathe.dm
View File

@@ -172,7 +172,6 @@
src.L += new /obj/item/weapon/rcd_ammo(src)
src.L += new /obj/item/weapon/scalpel(src)
src.L += new /obj/item/weapon/circular_saw(src)
src.L += new /obj/item/weapon/shield/riot(src)
src.L += new /obj/item/device/t_scanner(src)
src.L += new /obj/item/weapon/reagent_containers/glass/bucket(src)
src.LL += new /obj/item/weapon/flamethrower(src)
@@ -184,6 +183,7 @@
src.LL += new /obj/item/weapon/handcuffs(src)
src.LL += new /obj/item/weapon/ammo/a357(src)
src.LL += new /obj/item/weapon/ammo/a38(src)
src.LL += new /obj/item/weapon/shield/riot(src)
src.wires["Light Red"] = 0
src.wires["Dark Red"] = 0
src.wires["Blue"] = 0

24
code/game/objects/items/weapons/swords_axes_etc.dm
View File

@@ -97,6 +97,14 @@ STUN BATON
return
if (status == 0 || (status == 1 && charges ==0))
if(user.a_intent == "hurt")
if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (M.weakened < 5 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
M.weakened = 5
..()
@@ -114,6 +122,14 @@ STUN BATON
if((charges > 0 && status == 1) && (istype(H, /mob/living/carbon/human)))
flick("baton_active", src)
if (user.a_intent == "hurt")
if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
playsound(src.loc, 'Genhit.ogg', 50, 1, -1)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
@@ -128,6 +144,14 @@ STUN BATON
if (M.stunned < 1 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
M.stunned = 1
else
if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (!istype(H:l_hand, /obj/item/weapon/shield/riot) && prob(40))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s stun baton with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
if(isrobot(user))
var/mob/living/silicon/robot/R = user