Merge pull request #6584 from Iamgoofball/patch-6

quick fix for #6498
2025-12-12 03:02:54 +00:00 · 2014-10-05 10:10:50 +10:30
parent 41ce4fc57d a5dacfc5bd
commit 77917fb2c4
2 changed files with 5 additions and 2 deletions
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -425,6 +425,7 @@
 	caliber = ".45"
 	origin_tech = "combat=2;materials=2;syndicate=8"
 	ammo_type = "/obj/item/ammo_casing/chameleon"
+	matter = list()
 	var/list/gun_choices = list()

 	New()
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -143,6 +143,7 @@
 	ammo_type = "/obj/item/ammo_casing/chameleon"
 	max_ammo = 7
 	multiple_sprites = 1
+	matter = list()

 /obj/item/ammo_magazine/chameleon/empty
 	name = "magazine (.45)"
@@ -150,3 +151,4 @@
 	ammo_type = "/obj/item/ammo_casing/chameleon"
 	max_ammo = 0
 	multiple_sprites = 1
+	matter = list()