From b897e76c077c3dea5603da6942f20ed2001b0b83 Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 22 Nov 2021 23:21:29 -0500 Subject: [PATCH 1/2] Fix for issue #5643 --- code/game/objects/items/weapons/storage/fancy.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 67ac33d136..f8f311d20f 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -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) From e79f88adfe35378dba804197d72b50922c9880d6 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Thu, 9 Dec 2021 23:40:10 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/game/objects/items/weapons/storage/fancy.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index f8f311d20f..aa0e4598ea 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -68,11 +68,7 @@ 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) @@ -85,11 +81,7 @@ 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) @@ -102,11 +94,7 @@ 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)