From b46275079e30e6530f82ea4f704d65cd5528c7e5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 19 Dec 2017 15:29:45 -0600 Subject: [PATCH] Update ammo_casings.dm --- code/modules/projectiles/ammunition/ammo_casings.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index d3ca08dc85..edd28e72a8 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -284,15 +284,9 @@ icon_state = "cshell" projectile_type = /obj/item/projectile/bullet/dart -<<<<<<< HEAD -/obj/item/ammo_casing/shotgun/dart/New() - ..() - container_type |= OPENCONTAINER_1 -======= /obj/item/ammo_casing/shotgun/dart/Initialize() . = ..() container_type |= OPENCONTAINER ->>>>>>> 40699a8... [READY]Refactors reagent container types (#33470) create_reagents(30) reagents.set_reacting(TRUE) @@ -308,4 +302,4 @@ reagents.add_reagent("spore", 6) reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT reagents.add_reagent("coniine", 6) - reagents.add_reagent("sodium_thiopental", 6) \ No newline at end of file + reagents.add_reagent("sodium_thiopental", 6)