cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

riot shield nerf, also blocks spit. four in armory, one in hos locker, orderable from QM

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@192 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
2010-09-27 21:52:02 +00:00
parent 998187e0e2
commit fef2b5baa5
7 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/secure/security.dm
+1 -1
View File
@@ -54,7 +54,7 @@
/obj/secure_closet/hos/New()
..()
sleep(2)
// new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/gun/energy/general( src )
new /obj/item/device/flash( src )
new /obj/item/weapon/storage/id_kit( src )
code/game/objects/items/weapons/guns_ammo.dm
+17
View File
@@ -213,7 +213,16 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
M << "\red The helmet protects you from being hit hard in the head!"
return
if ((user.a_intent == "hurt" && src.bullets > 0))
if (!istype(H:r_hand, /obj/item/weapon/shield/riot) && prob(20))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s point-blank shot 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(20))
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] has blocked []'s point-blank shot with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (prob(20))
if (M.paralysis < 10)
M.paralysis = 10
@@ -228,6 +237,14 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
for(var/mob/O in viewers(M, null))
if(O.client) O.show_message(text("\red <B>[] has been shot point-blank by []!</B>", M, user), 1, "\red You hear someone fall", 2)
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 pistolwhip 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 pistolwhip with the riot shield!</B>", M, user), 1, "\red You hear a cracking sound", 2)
return
if (prob(50))
if (M.paralysis < 60)
M.paralysis = 60
code/game/objects/items/weapons/swords_axes_etc.dm
+6 -6
View File
@@ -97,14 +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))
/* 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
return*/
if (M.weakened < 5 && (!(M.mutations & 8)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
M.weakened = 5
..()
@@ -122,14 +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))
/* 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
return*/
playsound(src.loc, 'Genhit.ogg', 50, 1, -1)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
@@ -144,14 +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))
/* 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
return*/
playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
code/game/supplyshuttle.dm
+2 -2
View File
@@ -200,8 +200,8 @@ var/supply_shuttle_points = 50
name = "Riot crate"
contains = list("/obj/item/weapon/baton",
"/obj/item/weapon/baton",
// "/obj/item/weapon/shield/riot",
// "/obj/item/weapon/shield/riot",
"/obj/item/weapon/shield/riot",
"/obj/item/weapon/shield/riot",
"/obj/item/weapon/storage/flashbang_kit",
"/obj/item/weapon/storage/flashbang_kit",
"/obj/item/weapon/handcuffs",
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+6
View File
@@ -66,6 +66,12 @@ Also perhaps only queens can do that?
if (get_dist(A,M) == 0)
for(var/mob/O in viewers(src, null))
O.show_message(text("\green <B>[src] has spat at [M.name]!</B>"), 1)
if (!istype(M:l_hand, /obj/item/weapon/shield/riot) && prob(50))
del(A)
return
if (!istype(M:r_hand, /obj/item/weapon/shield/riot) && prob(50))
del(A)
return
M.weakened += 5
M.fireloss += 10
del(A)
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -223,7 +223,7 @@
d = d / 2
d = d / 5
if (istype(src.r_hand, /obj/item/weapon/shield/riot))
if (prob(70))
if (prob(90))
show_message("\red Your shield absorbs the blow!", 4)
return
else
@@ -234,7 +234,7 @@
d = d / 5
else
if (istype(src.l_hand, /obj/item/weapon/shield/riot))
if (prob(70))
if (prob(90))
show_message("\red Your shield absorbs the blow!", 4)
return
else