From 1db3c0c18b8a8962421cc32f2336a80821301763 Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 20 Oct 2015 15:52:38 -0400 Subject: [PATCH] Syndicate bomb payloads will now detonate if set on fire long enough. Note that the casings for the bombs is fireproof, so if you want to set fire to a bombcore you'll need to remove it from the case first. Fixes #12468 while I'm here to avoid another box pull --- code/game/machinery/syndicatebomb.dm | 5 +++++ .../structures/crates_lockers/closets/cardboardbox.dm | 1 + html/changelogs/incoming_booms.yml | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 html/changelogs/incoming_booms.yml diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 120a797fbae..27f2448de1a 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -182,11 +182,16 @@ item_state = "eshield0" w_class = 3 origin_tech = "syndicate=6;combat=5" + burn_state = 0 //Burnable (but the casing isn't) var/adminlog = null /obj/item/weapon/bombcore/ex_act(severity, target) //Little boom can chain a big boom src.detonate() +/obj/item/weapon/bombcore/burn() + src.detonate() + ..() + /obj/item/weapon/bombcore/proc/detonate() if(adminlog) message_admins(adminlog) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 609ba076b93..5aa7838ee31 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -4,6 +4,7 @@ icon_state = "cardboard" health = 10 mob_storage_capacity = 1 + burn_state = 0 //Burnable burntime = 20 can_weld_shut = 0 cutting_tool = /obj/item/weapon/wirecutters diff --git a/html/changelogs/incoming_booms.yml b/html/changelogs/incoming_booms.yml new file mode 100644 index 00000000000..b1ade5bb082 --- /dev/null +++ b/html/changelogs/incoming_booms.yml @@ -0,0 +1,6 @@ + +author: Incoming5643 +delete-after: True + +changes: + - rscadd: "Syndicate bomb payloads will now detonate if set on fire long enough. Note that the casings for the bombs is fireproof, so if you want to set fire to a bombcore you'll need to remove it from the case first (cut all wires, then crowbar it out). A reassurance from our explosives department: it is, and always has been, impossible to detonate a syndicate bomb that isn't ticking with wirecutters alone." \ No newline at end of file