cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge error

Browse Source
This commit is contained in:
LanCartwright
2015-12-20 21:04:09 +00:00
parent 12206ae324
commit 986bfc8501
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/backpack.dm
+1 -5
View File
@@ -469,7 +469,7 @@
new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src)
new /obj/item/ammo_box/foambox/riot(src)
return
<<<<<<< HEAD
<<<<<<< HEAD
/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle
desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots."
@@ -497,7 +497,3 @@
new /obj/item/ammo_box/foambox/riot(src)
new /obj/item/weapon/grenade/chem_grenade/bioterrorfoam(src)
return
=======
>>>>>>> 29ffdd90aa08a526adbb839c41dbb958225e5bf8