From 1c7a9c6837a039d1fed2cbb4c53564c1188fa15e Mon Sep 17 00:00:00 2001 From: Leshana Date: Mon, 19 Feb 2018 19:23:11 -0500 Subject: [PATCH 1/3] Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts. --- code/game/objects/items/weapons/storage/fancy.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 251e5483e19..07457c934d3 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -307,6 +307,7 @@ /obj/item/weapon/storage/fancy/heartbox icon_state = "heartbox" name = "box of chocolates" + icon_type = "chocolates" var/startswith = 6 max_storage_space = ITEMSIZE_COST_SMALL * 6 can_hold = list( From 581bee4909d89dd10706111c1f475ab07626cbf1 Mon Sep 17 00:00:00 2001 From: Leshana Date: Mon, 19 Feb 2018 23:13:26 -0500 Subject: [PATCH 2/3] Fix runtime when clicking RCD on almost anything. - get_base_turf_by_area() must only be called on turfs! --- code/game/objects/items/weapons/RCD.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 8f5719b8e82..196f8d4a74c 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -103,7 +103,7 @@ build_delay = 50 build_type = "airlock" build_other = /obj/machinery/door/airlock - else if(!deconstruct && (istype(T,/turf/space) || istype(T,get_base_turf_by_area(T)))) + else if(!deconstruct && isturf(T) && (istype(T,/turf/space) || istype(T,get_base_turf_by_area(T)))) build_cost = 1 build_type = "floor" build_turf = /turf/simulated/floor/airless From 32c177b66f43ec3feeb5f7e900736e781d78d965 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 22 Feb 2018 10:17:49 -0500 Subject: [PATCH 3/3] Stop candles from messaging the universe when they light. --- code/game/objects/items/weapons/candle.dm | 37 ++++++++--------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 7bc0398b729..3f861b86d4b 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -8,7 +8,7 @@ var/wax = 2000 /obj/item/weapon/flame/candle/New() - wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average. + wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average. ..() /obj/item/weapon/flame/candle/update_icon() @@ -26,7 +26,7 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool - light("\The [user] casually lights the [name] with [W].") + light("\The [user] casually lights the [src] with [W].") else if(istype(W, /obj/item/weapon/flame/lighter)) var/obj/item/weapon/flame/lighter/L = W if(L.lit) @@ -41,16 +41,13 @@ light() -/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [name].") - if(!src.lit) - src.lit = 1 - //src.damtype = "fire" - for(var/mob/O in viewers(usr, null)) - O.show_message(flavor_text, 1) +/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") + if(!lit) + lit = TRUE + visible_message(flavor_text) set_light(CANDLE_LUM) processing_objects.Add(src) - /obj/item/weapon/flame/candle/process() if(!lit) return @@ -88,23 +85,13 @@ /obj/item/weapon/flame/candle/everburn wax = 99999 -/obj/item/weapon/flame/candle/everburn/New() - if(!src.lit) - src.lit = 1 - //src.damtype = "fire" - for(var/mob/O in viewers(usr, null)) - O.show_message("\The [name] mysteriously lights itself!.", 1) - set_light(CANDLE_LUM) - processing_objects.Add(src) +/obj/item/weapon/flame/candle/everburn/initialize() + . = ..() + light("\The [src] mysteriously lights itself!.") /obj/item/weapon/flame/candle/candelabra/everburn wax = 99999 -/obj/item/weapon/flame/candle/candelabra/everburn/New() - if(!src.lit) - src.lit = 1 - //src.damtype = "fire" - for(var/mob/O in viewers(usr, null)) - O.show_message("\The [name] mysteriously lights itself!.", 1) - set_light(CANDLE_LUM) - processing_objects.Add(src) +/obj/item/weapon/flame/candle/candelabra/everburn/initialize() + . = ..() + light("\The [src] mysteriously lights itself!.")