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

Fix for issue #5643

Browse Source
This commit is contained in:
Casey
2021-12-10 06:13:28 +00:00
committed by Chompstation Bot
parent e6f330182b
commit b897e76c07
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/fancy.dm
+12
View File
@@ -68,7 +68,11 @@
item_state = "candlebox5"
throwforce = 2
slot_flags = SLOT_BELT
<<<<<<< HEAD
max_storage_space = ITEMSIZE_COST_TINY * 5 //CHOMPEdit
=======
max_storage_space = ITEMSIZE_COST_TINY * 5
>>>>>>> 7ed7f7dfad... Merge pull request #11878 from GhostActual/Fix-for-#5643
can_hold = list(/obj/item/weapon/flame/candle)
starts_with = list(/obj/item/weapon/flame/candle = 5)
@@ -81,7 +85,11 @@
item_state = "whitecandlebox5"
throwforce = 2
slot_flags = SLOT_BELT
<<<<<<< HEAD
max_storage_space = ITEMSIZE_COST_TINY * 5 //CHOMPEdit
=======
max_storage_space = ITEMSIZE_COST_TINY * 5
>>>>>>> 7ed7f7dfad... Merge pull request #11878 from GhostActual/Fix-for-#5643
can_hold = list(/obj/item/weapon/flame/candle)
starts_with = list(/obj/item/weapon/flame/candle/white = 5)
@@ -94,7 +102,11 @@
item_state = "blackcandlebox5"
throwforce = 2
slot_flags = SLOT_BELT
<<<<<<< HEAD
max_storage_space = ITEMSIZE_COST_TINY * 5 //CHOMPEdit
=======
max_storage_space = ITEMSIZE_COST_TINY * 5
>>>>>>> 7ed7f7dfad... Merge pull request #11878 from GhostActual/Fix-for-#5643
can_hold = list(/obj/item/weapon/flame/candle)
starts_with = list(/obj/item/weapon/flame/candle/black = 5)