cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update supply.dm

Browse Source
This commit is contained in:
Novacat
2020-07-22 18:02:16 -04:00
committed by GitHub
parent 382e676ee2
commit cdeb6b73cc
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/supplypacks/supply.dm
View File

@@ -134,10 +134,5 @@
name = "Cargo Train Trolley"
contains = list(/obj/vehicle/train/trolley)
cost = 15
<<<<<<< HEAD
containertype = /obj/structure/largecrate
containername = "Cargo Train Trolley Crate"
=======
containertype = /obj/structure/closet/crate/large/xion
containername = "Cargo Train Trolley Crate"
>>>>>>> d7f25c3... Flavour Enhancement: Crates (#7342)