cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Intents

Browse Source
This commit is contained in:
Sam
2017-06-10 09:43:36 +01:00
parent c1cc319f62
commit 4d57fff5c9
94 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+2 -2
View File
@@ -117,7 +117,7 @@
if(flag) //It's adjacent, is the user, or is on the user's person
if(target in user.contents) //can't shoot stuff inside us.
return
if(!ismob(target) || user.a_intent == I_HARM) //melee attack
if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack
return
if(target == user && user.zone_sel.selecting != "mouth") //so we can't shoot ourselves (unless mouth selected)
return
@@ -232,7 +232,7 @@ obj/item/weapon/gun/proc/newshot()
feedback_add_details("gun_fired","[type]")
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
if(user.a_intent == I_HARM) //Flogging
if(user.a_intent == INTENT_HARM) //Flogging
..()
else
return
code/modules/projectiles/guns/projectile/revolver.dm
+1 -1
View File
@@ -218,7 +218,7 @@
/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
if(flag)
if(!(target in user.contents) && ismob(target))
if(user.a_intent == I_HARM) // Flogging action
if(user.a_intent == INTENT_HARM) // Flogging action
return
if(isliving(user))
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -243,7 +243,7 @@ proc/wabbajack(mob/living/M)
M.create_attack_log("<font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
new_mob.attack_log = M.attack_log
new_mob.a_intent = I_HARM
new_mob.a_intent = INTENT_HARM
if(M.mind)
M.mind.transfer_to(new_mob)
else