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

Merge pull request #6584 from Iamgoofball/patch-6

Browse Source 
quick fix for #6498
This commit is contained in:
Zuhayr
2014-10-05 10:10:50 +10:30
parent 41ce4fc57d a5dacfc5bd
commit 77917fb2c4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/clothing/under/chameleon.dm
View File

@@ -425,6 +425,7 @@
caliber = ".45" caliber = ".45"
origin_tech = "combat=2;materials=2;syndicate=8" origin_tech = "combat=2;materials=2;syndicate=8"
ammo_type = "/obj/item/ammo_casing/chameleon" ammo_type = "/obj/item/ammo_casing/chameleon"
matter = list()
var/list/gun_choices = list() var/list/gun_choices = list()
New() New()
@@ -464,4 +465,4 @@
flags_inv = A.flags_inv flags_inv = A.flags_inv
if(usr) if(usr)
usr.update_inv_r_hand() usr.update_inv_r_hand()
usr.update_inv_l_hand() //so our overlays update. usr.update_inv_l_hand() //so our overlays update.

4
code/modules/projectiles/ammunition/boxes.dm
View File

@@ -143,10 +143,12 @@
ammo_type = "/obj/item/ammo_casing/chameleon" ammo_type = "/obj/item/ammo_casing/chameleon"
max_ammo = 7 max_ammo = 7
multiple_sprites = 1 multiple_sprites = 1
matter = list()
/obj/item/ammo_magazine/chameleon/empty /obj/item/ammo_magazine/chameleon/empty
name = "magazine (.45)" name = "magazine (.45)"
icon_state = "45" icon_state = "45"
ammo_type = "/obj/item/ammo_casing/chameleon" ammo_type = "/obj/item/ammo_casing/chameleon"
max_ammo = 0 max_ammo = 0
multiple_sprites = 1 multiple_sprites = 1
matter = list()