From 29ad42fea7cb9080e775840c3ba498e3ca191e2c Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 27 Jul 2016 05:11:12 +0100 Subject: [PATCH] Does some stuff --- code/datums/uplink/tools.dm | 19 ++++++++++++++++++- code/game/objects/items/weapons/syndie.dm | 21 ++++++++++----------- polaris.dme | 1 + 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm index 7a02e169903..51fd7d51fc5 100644 --- a/code/datums/uplink/tools.dm +++ b/code/datums/uplink/tools.dm @@ -16,9 +16,26 @@ /datum/uplink_item/item/tools/plastique name = "C-4 (Destroys walls)" - item_cost = 20 + item_cost = 10 path = /obj/item/weapon/plastique +/datum/uplink_item/item/tools/packagebomb + name = "Package Bomb (Small)" + item_cost = 20 + path = /obj/item/weapon/storage/box/syndie_kit/demolitions + +/datum/uplink_item/item/tools/packagebomb/large + name = "Package Bomb (Large)" + item_cost = 40 + path = /obj/item/weapon/storage/box/syndie_kit/demolitions_heavy + +/* +/datum/uplink_item/item/tools/packagebomb/huge + name = "Package Bomb (Huge) + item_cost = 60 + path = /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy +*/ + /datum/uplink_item/item/tools/encryptionkey_radio name = "Encrypted Radio Channel Key" item_cost = 20 diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 7e0971cd4bd..fb9aa3eb416 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -39,17 +39,16 @@ /obj/item/weapon/syndie/c4explosive/proc/detonate() icon_state = "c-4[size]_1" - spawn(50) - explosion(get_turf(src), power, power*2, power*3, power*4, power*5) - for(var/dirn in cardinal) //This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors. - var/turf/simulated/wall/T = get_step(src,dirn) - if(locate(/obj/machinery/door/airlock) in T) - var/obj/machinery/door/airlock/D = locate() in T - if(D.density) - D.open() - if(istype(T,/turf/simulated/wall)) - T.dismantle_wall(1) - qdel(src) + explosion(get_turf(src), power, power*2, power*3, power*4, power*5) + for(var/dirn in cardinal) //This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors. + var/turf/simulated/wall/T = get_step(src,dirn) + if(locate(/obj/machinery/door/airlock) in T) + var/obj/machinery/door/airlock/D = locate() in T + if(D.density) + D.open() + if(istype(T,/turf/simulated/wall)) + T.dismantle_wall(1) + qdel(src) /*Detonator, disguised as a lighter*/ diff --git a/polaris.dme b/polaris.dme index 4c0a8079c64..939f94bbaa4 100644 --- a/polaris.dme +++ b/polaris.dme @@ -827,6 +827,7 @@ #include "code\game\objects\items\weapons\stunbaton.dm" #include "code\game\objects\items\weapons\surgery_tools.dm" #include "code\game\objects\items\weapons\swords_axes_etc.dm" +#include "code\game\objects\items\weapons\syndie.dm" #include "code\game\objects\items\weapons\tape.dm" #include "code\game\objects\items\weapons\teleportation.dm" #include "code\game\objects\items\weapons\tools.dm"