From 40617b7695776d28f30887c654f4beaa273f3075 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 4 Apr 2017 22:36:08 -0500 Subject: [PATCH 1/2] Package bomb changes --- code/datums/uplink/tools.dm | 14 ++++---- code/game/objects/items/weapons/syndie.dm | 5 +++ html/changelogs/Anewbe - Package Bombs.yml | 37 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/Anewbe - Package Bombs.yml diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm index 17203e3d5d..7cea842778 100644 --- a/code/datums/uplink/tools.dm +++ b/code/datums/uplink/tools.dm @@ -58,11 +58,6 @@ item_cost = 15 path = /obj/item/device/encryptionkey/binary -/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/hacking_tool name = "Door Hacking Tool" item_cost = 20 @@ -81,6 +76,11 @@ item_cost = 30 path = /obj/item/clothing/glasses/thermal/syndi +/datum/uplink_item/item/tools/packagebomb + name = "Package Bomb (Small)" + item_cost = 30 + path = /obj/item/weapon/storage/box/syndie_kit/demolitions + /datum/uplink_item/item/tools/powersink name = "Powersink (DANGER!)" item_cost = 40 @@ -88,13 +88,13 @@ /datum/uplink_item/item/tools/packagebomb/large name = "Package Bomb (Large)" - item_cost = 40 + item_cost = 60 path = /obj/item/weapon/storage/box/syndie_kit/demolitions_heavy /* /datum/uplink_item/item/tools/packagebomb/huge name = "Package Bomb (Huge) - item_cost = 60 + item_cost = 100 path = /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy */ diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 490ae2d62b..1c287dd214 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -15,6 +15,7 @@ var/power = 1 /*Size of the explosion.*/ var/size = "small" /*Used for the icon, this one will make c-4small_0 for the off state.*/ + var/det_time = 15 //How long the thing takes between beeps, will beep three times before it goes off. /obj/item/weapon/syndie/c4explosive/heavy icon_state = "c-4large_0" @@ -39,6 +40,10 @@ /obj/item/weapon/syndie/c4explosive/proc/detonate() icon_state = "c-4[size]_1" + playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1) + for(var/mob/O in hearers(src, null)) + O.show_message("\icon[src] The [src.name] beeps! ") + sleep(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) diff --git a/html/changelogs/Anewbe - Package Bombs.yml b/html/changelogs/Anewbe - Package Bombs.yml new file mode 100644 index 0000000000..5fa9e3ba88 --- /dev/null +++ b/html/changelogs/Anewbe - Package Bombs.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Package bombs now beep when activated, and have a delay before exploding." + - tweak: "Package bombs are more expensive." From 584fd3ed303b3b4d50e9c8b71a4909e0b2e19635 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 4 Apr 2017 22:38:07 -0500 Subject: [PATCH 2/2] Missed a test var --- code/game/objects/items/weapons/syndie.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 1c287dd214..3de967d78f 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -15,7 +15,6 @@ var/power = 1 /*Size of the explosion.*/ var/size = "small" /*Used for the icon, this one will make c-4small_0 for the off state.*/ - var/det_time = 15 //How long the thing takes between beeps, will beep three times before it goes off. /obj/item/weapon/syndie/c4explosive/heavy icon_state = "c-4large_0" @@ -94,4 +93,4 @@ /obj/item/weapon/flame/lighter/zippo/c4detonator/attackby(obj/item/weapon/W, mob/user as mob) if(istype(W, /obj/item/weapon/screwdriver)) detonator_mode = !detonator_mode - user << "You unscrew the top panel of \the [src] revealing a button." \ No newline at end of file + user << "You unscrew the top panel of \the [src] revealing a button."