cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Runtime fix for Russian Revolvers.

Browse Source 
You cannot reuse bullets with Russian Revolvers now.
Sinks can now fill any reagent containers, you can set the amount to fill by setting the reagent container's transfer amount. Was added so Chefs can be more precise when using water in their ingredients.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4098 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-07-17 17:57:22 +00:00
parent 7023f734ea
commit 2a06209972
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/projectiles/guns/projectile/revolver.dm
View File

@@ -69,8 +69,11 @@
/obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob)
if(!A) return
var/num_loaded = 0
if(istype(A, /obj/item/ammo_magazine))
if((load_method == 2) && loaded.len) return
var/obj/item/ammo_magazine/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
@@ -82,16 +85,7 @@
loaded += AC
num_loaded++
break
if(load_method == 2)
..()
return
if(istype(A, /obj/item/ammo_casing) && !load_method)
var/obj/item/ammo_casing/AC = A
if(AC.caliber == caliber && loaded.len < max_shells && getAmmo() == 0)
user.drop_item()
AC.loc = src
loaded += AC
num_loaded++
A.update_icon()
if(num_loaded)
user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
@@ -99,7 +93,6 @@
user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
if(getAmmo() > 0)
Spin()
A.update_icon()
update_icon()
return