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

Ammo magazine and casing update

Browse Source 
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
This commit is contained in:
mwerezak
2015-02-08 20:27:53 -05:00
parent a679d22db8
commit fc6dfb5f1b
19 changed files with 527 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -367,7 +367,7 @@
item_type = "gun"
if(27)
//revolver
var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc)
var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile/revolver(src.loc)
new_item = new_gun
new_item.icon_state = "gun[rand(1,4)]"
new_item.icon = 'icons/obj/xenoarchaeology.dmi'
@@ -383,7 +383,7 @@
if(num_bullets < new_gun.loaded.len)
new_gun.loaded.Cut()
for(var/i = 1, i <= num_bullets, i++)
var/A = text2path(new_gun.ammo_type)
var/A = new_gun.ammo_type
new_gun.loaded += new A(new_gun)
else
for(var/obj/item/I in new_gun)