cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory.

Browse Source 
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
This commit is contained in:
phil235
2015-03-12 14:34:23 +01:00
parent 6f0319e7b7
commit 921ed1330e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/revolver.dm
+8 -4
View File
@@ -127,7 +127,7 @@
/obj/item/weapon/gun/projectile/revolver/russian
name = "russian revolver"
desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism that spins the chamber before each trigger pull."
desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring to spin the chamber before each trigger pull."
origin_tech = "combat=2;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
var/spun = 0
@@ -175,13 +175,17 @@
user << "<span class='notice'>[src] is empty.</span>"
/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
if(user.a_intent == "harm") // Flogging action
return
if(flag)
if(!(target in user.contents) && ismob(target))
if(user.a_intent == "harm") // Flogging action
return
if(isliving(user))
if(!can_trigger_gun(user))
return
if(target != user)
user << "<span class='warning'>A mechanism prevents you from shooting anyone but yourself.</span>"
if(ismob(target))
user << "<span class='warning'>A mechanism prevents you from shooting anyone but yourself.</span>"
return
if(ishuman(user))