cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Guti
2024-09-18 18:33:15 +02:00
parent 06a46a237b
commit a3c7599065
19 changed files with 2 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/shelter_atoms_vr.dm
-11
View File
@@ -124,17 +124,6 @@ GLOBAL_LIST_EMPTY(unique_deployable)
desc = "A cozy cabin; crammed into a survival capsule."
template_id = "shelter_cab"
<<<<<<< HEAD
/obj/item/survivalcapsule/dropship
name = "dropship surfluid shelter capsule"
desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom."
template_id = "shelter_zeta"
unique_id = "shelter_6"
is_ship = TRUE
w_class = ITEMSIZE_SMALL
=======
>>>>>>> master
//Custom Shelter Capsules
/obj/item/survivalcapsule/tabiranth
name = "silver-trimmed surfluid shelter capsule"