cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-01-09 20:48:24 -05:00
committed by GitHub
parent 3fa644b0d6
commit 02fa3eba30
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/misc_vr.dm
-3
View File
@@ -161,8 +161,6 @@
cost = 300
containertype = /obj/structure/closet/crate
containername = "cordless jukebox speakers crate"
<<<<<<< HEAD
=======
/datum/supply_pack/misc/sword
name = "sword"
@@ -174,4 +172,3 @@
access_security,)
one_access = TRUE
>>>>>>> 3773f565937... Merge pull request #12042 from TheDavestDave/sword-crate