cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 02:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ammo_casings.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-19 15:29:45 -06:00
committed by GitHub
parent a8db6dc9c2
commit b46275079e
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/ammunition/ammo_casings.dm
View File

@@ -284,15 +284,9 @@
icon_state = "cshell" icon_state = "cshell"
projectile_type = /obj/item/projectile/bullet/dart 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() /obj/item/ammo_casing/shotgun/dart/Initialize()
. = ..() . = ..()
container_type |= OPENCONTAINER container_type |= OPENCONTAINER
>>>>>>> 40699a8... [READY]Refactors reagent container types (#33470)
create_reagents(30) create_reagents(30)
reagents.set_reacting(TRUE) reagents.set_reacting(TRUE)
@@ -308,4 +302,4 @@
reagents.add_reagent("spore", 6) reagents.add_reagent("spore", 6)
reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
reagents.add_reagent("coniine", 6) reagents.add_reagent("coniine", 6)
reagents.add_reagent("sodium_thiopental", 6) reagents.add_reagent("sodium_thiopental", 6)