From 6c121d232b527d351930c7a63ee1f7721872ff2d Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 9 May 2015 19:57:01 +0100 Subject: [PATCH 1/6] Makes bear traps do damage when stepped on --- code/defines/obj/weapon.dm | 14 ++++++++--- html/changelogs/Yoshax - trapping.YML | 36 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Yoshax - trapping.YML diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 5b0ae96726b..c1fc0566e2f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -198,18 +198,26 @@ if(armed) if(ishuman(AM)) if(isturf(src.loc)) - var/mob/living/carbon/H = AM + var/mob/living/carbon/human/H = AM if(H.m_intent == "run") armed = 0 H.legcuffed = src src.loc = H H.update_inv_legcuffed() - H << "\red You step on \the [src]!" + H << "You step on \the [src]!" + + var/obj/item/organ/external/affecting = H.get_organ(pick("l_leg", "r_leg")) feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. for(var/mob/O in viewers(H, null)) if(O == H) continue - O.show_message("\red [H] steps on \the [src].", 1) + O.show_message("[H] steps on \the [src].", 1) + + affecting.take_damage(35, 0) + H.UpdateDamageIcon() + H.updatehealth() + + if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) armed = 0 var/mob/living/simple_animal/SA = AM diff --git a/html/changelogs/Yoshax - trapping.YML b/html/changelogs/Yoshax - trapping.YML new file mode 100644 index 00000000000..140afce721d --- /dev/null +++ b/html/changelogs/Yoshax - trapping.YML @@ -0,0 +1,36 @@ +################################ +# 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: Yoshax + +# 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: + - rscadd: "Bear traps now do damage when stood on, enough to break bones!" From 86bf94ba079e78fd1be2c0cc695be9dd52d12ffd Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 10 May 2015 20:09:29 +0100 Subject: [PATCH 2/6] Refactors bear traps --- code/defines/obj/weapon.dm | 83 +++++++++++++++---- .../research/xenoarchaeology/finds/finds.dm | 2 +- html/changelogs/Yoshax - trapping.YML | 3 +- maps/exodus-1.dmm | 2 +- 4 files changed, 71 insertions(+), 19 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index c1fc0566e2f..3dd6aed05b0 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -175,47 +175,91 @@ origin_tech = "materials=1" var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute -/obj/item/weapon/legcuffs/beartrap +/obj/item/weapon/beartrap name = "bear trap" throw_speed = 2 throw_range = 1 + gender = PLURAL + icon = 'icons/obj/items.dmi' icon_state = "beartrap0" desc = "A trap used to catch bears and other legged creatures." + throwforce = 0 + w_class = 3.0 + origin_tech = "materials=1" var/armed = 0 + var/deployed = 0 suicide_act(mob/user) - viewers(user) << "\red [user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide." return (BRUTELOSS) -/obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob) +/obj/item/weapon/beartrap/attack_self(mob/user as mob) ..() if(ishuman(user) && !user.stat && !user.restrained()) - armed = !armed - icon_state = "beartrap[armed]" - user << "[src] is now [armed ? "armed" : "disarmed"]" + if(deployed==0) + user.visible_message("[user] is deploying \the [src]", "You are deploying \the [src]!") + if (do_after(user, 60)) + user.visible_message("[user] has deployed \the [src]", "You have deployed \the [src]!") + deployed = 1 + armed = 1 + user.drop_from_inventory(src, user.loc) + update_icon() + anchored = 1 -/obj/item/weapon/legcuffs/beartrap/Crossed(AM as mob|obj) +/obj/item/weapon/beartrap/attack_hand(mob/user as mob) + if(ishuman(user) && !user.stat && !user.restrained()) + if(deployed==1) + user.visible_message("[user] is disarming \the [src]", "You are disarming \the [src]!") + if (do_after(user, 60)) + user.visible_message("[user] has disarmed \the [src]", "You have disarmed \the [src]!") + deployed = 0 + armed = 0 + anchored = 0 + update_icon() + + if(deployed==0) + ..() + +/obj/item/weapon/beartrap/Crossed(AM as mob|obj) if(armed) if(ishuman(AM)) if(isturf(src.loc)) var/mob/living/carbon/human/H = AM if(H.m_intent == "run") armed = 0 - H.legcuffed = src - src.loc = H - H.update_inv_legcuffed() + update_icon() + //H.legcuffed = src + //src.loc = H + //H.update_inv_legcuffed() H << "You step on \the [src]!" - var/obj/item/organ/external/affecting = H.get_organ(pick("l_leg", "r_leg")) - feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart. + feedback_add_details("handcuffs","B") for(var/mob/O in viewers(H, null)) if(O == H) continue O.show_message("[H] steps on \the [src].", 1) - - affecting.take_damage(35, 0) - H.UpdateDamageIcon() - H.updatehealth() + if(H.lying) + var/list/potentialorgans = list() + for(var/organ in list("l_leg", "l_foot", "r_leg", "r_foot", "groin", "chest", "head", "r_arm", "r_hand", "l_arm", "l_hand")) //iterate over names + var/obj/item/organ/external/R = H.get_organ(organ) + if(R && !(R.status & ORGAN_DESTROYED)) + potentialorgans += R + var/obj/item/organ/external/affecting = pick(potentialorgans) + affecting.take_damage(30, 0) + affecting.embed(src, 1) + H.UpdateDamageIcon() + H.updatehealth() + else + var/list/potentialorgans = list() + for(var/organ in list("l_leg", "r_leg", "l_foot", "r_foot")) + var/obj/item/organ/external/R = H.get_organ(organ) + if(R && !(R.status & ORGAN_DESTROYED)) + potentialorgans += R + var/obj/item/organ/external/affecting = pick(potentialorgans) + affecting.take_damage(30, 0) + affecting.embed(src, 1) + H.UpdateDamageIcon() + H.updatehealth() if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) @@ -224,6 +268,13 @@ SA.health -= 20 ..() +/obj/item/weapon/beartrap/update_icon() + ..() + + if(armed == 0) + icon_state = "beartrap0" + else + icon_state = "beartrap1" /obj/item/weapon/caution diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 521da5e4aad..3f3d3c95c26 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -191,7 +191,7 @@ if(9) item_type = "[pick("wicked","evil","byzantine","dangerous")] looking [pick("device","contraption","thing","trap")]" apply_prefix = 0 - new_item = new /obj/item/weapon/legcuffs/beartrap(src.loc) + new_item = new /obj/item/weapon/beartrap/(src.loc) additional_desc = "[pick("It looks like it could take a limb off",\ "Could be some kind of animal trap",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along part of it")]." diff --git a/html/changelogs/Yoshax - trapping.YML b/html/changelogs/Yoshax - trapping.YML index 140afce721d..0de61852a99 100644 --- a/html/changelogs/Yoshax - trapping.YML +++ b/html/changelogs/Yoshax - trapping.YML @@ -33,4 +33,5 @@ delete-after: True # 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: - - rscadd: "Bear traps now do damage when stood on, enough to break bones!" + - tweak: "Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack." + - tweak: "Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they were deployed." \ No newline at end of file diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 0af561fa81f..4f13080afc4 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -4927,7 +4927,7 @@ "bQM" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = -29},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor,/area/janitor) "bQN" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light,/turf/simulated/floor,/area/janitor) "bQO" = (/obj/structure/janitorialcart,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor,/area/janitor) -"bQP" = (/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/janitor) +"bQP" = (/obj/item/weapon/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/janitor) "bQQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/janitor) "bQR" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/janitor) "bQS" = (/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/maintenance/engineering) From b0d10a650841dcd7ee26a4e3373f72ff696df725 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 10 May 2015 20:15:19 +0100 Subject: [PATCH 3/6] Fixes some stuff (+2 squashed commit) Squashed commit: [f63e170] Removes unnecessary / [ac1b52c] re adds 1 bear trap i somehow accidently removed --- code/defines/obj/weapon.dm | 16 +++------------- .../research/xenoarchaeology/finds/finds.dm | 2 +- html/changelogs/Yoshax - trapping.YML | 2 +- maps/exodus-1.dmm | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 3dd6aed05b0..a497f4f7f32 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -228,25 +228,15 @@ if(H.m_intent == "run") armed = 0 update_icon() - //H.legcuffed = src - //src.loc = H - //H.update_inv_legcuffed() H << "You step on \the [src]!" - - feedback_add_details("handcuffs","B") for(var/mob/O in viewers(H, null)) if(O == H) continue O.show_message("[H] steps on \the [src].", 1) if(H.lying) - var/list/potentialorgans = list() - for(var/organ in list("l_leg", "l_foot", "r_leg", "r_foot", "groin", "chest", "head", "r_arm", "r_hand", "l_arm", "l_hand")) //iterate over names - var/obj/item/organ/external/R = H.get_organ(organ) - if(R && !(R.status & ORGAN_DESTROYED)) - potentialorgans += R - var/obj/item/organ/external/affecting = pick(potentialorgans) + var/obj/item/organ/external/affecting = pick(H.organs) affecting.take_damage(30, 0) - affecting.embed(src, 1) + affecting.embed(src) H.UpdateDamageIcon() H.updatehealth() else @@ -257,7 +247,7 @@ potentialorgans += R var/obj/item/organ/external/affecting = pick(potentialorgans) affecting.take_damage(30, 0) - affecting.embed(src, 1) + affecting.embed(src) H.UpdateDamageIcon() H.updatehealth() diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 3f3d3c95c26..d9d5f300b02 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -191,7 +191,7 @@ if(9) item_type = "[pick("wicked","evil","byzantine","dangerous")] looking [pick("device","contraption","thing","trap")]" apply_prefix = 0 - new_item = new /obj/item/weapon/beartrap/(src.loc) + new_item = new /obj/item/weapon/beartrap(src.loc) additional_desc = "[pick("It looks like it could take a limb off",\ "Could be some kind of animal trap",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along part of it")]." diff --git a/html/changelogs/Yoshax - trapping.YML b/html/changelogs/Yoshax - trapping.YML index 0de61852a99..d9b7884761a 100644 --- a/html/changelogs/Yoshax - trapping.YML +++ b/html/changelogs/Yoshax - trapping.YML @@ -34,4 +34,4 @@ delete-after: True # 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: "Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack." - - tweak: "Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they were deployed." \ No newline at end of file + - tweak: "Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they are deployed." \ No newline at end of file diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 4f13080afc4..80333858397 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -4927,7 +4927,7 @@ "bQM" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = -29},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor,/area/janitor) "bQN" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light,/turf/simulated/floor,/area/janitor) "bQO" = (/obj/structure/janitorialcart,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor,/area/janitor) -"bQP" = (/obj/item/weapon/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/janitor) +"bQP" = (/obj/item/weapon/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/weapon/beartrap,/turf/simulated/floor,/area/janitor) "bQQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/janitor) "bQR" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/janitor) "bQS" = (/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/maintenance/engineering) From 5ff5214528324f18a1715358c28da27105696b96 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 10 May 2015 20:51:36 +0100 Subject: [PATCH 4/6] Removes redundant var --- code/defines/obj/weapon.dm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index a497f4f7f32..831cd68925e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -186,7 +186,6 @@ throwforce = 0 w_class = 3.0 origin_tech = "materials=1" - var/armed = 0 var/deployed = 0 suicide_act(mob/user) @@ -201,7 +200,6 @@ if (do_after(user, 60)) user.visible_message("[user] has deployed \the [src]", "You have deployed \the [src]!") deployed = 1 - armed = 1 user.drop_from_inventory(src, user.loc) update_icon() anchored = 1 @@ -213,7 +211,6 @@ if (do_after(user, 60)) user.visible_message("[user] has disarmed \the [src]", "You have disarmed \the [src]!") deployed = 0 - armed = 0 anchored = 0 update_icon() @@ -221,12 +218,12 @@ ..() /obj/item/weapon/beartrap/Crossed(AM as mob|obj) - if(armed) + if(deployed) if(ishuman(AM)) if(isturf(src.loc)) var/mob/living/carbon/human/H = AM if(H.m_intent == "run") - armed = 0 + deployed = 0 update_icon() H << "You step on \the [src]!" for(var/mob/O in viewers(H, null)) @@ -253,7 +250,7 @@ if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) - armed = 0 + deployed = 0 var/mob/living/simple_animal/SA = AM SA.health -= 20 ..() @@ -261,7 +258,7 @@ /obj/item/weapon/beartrap/update_icon() ..() - if(armed == 0) + if(deployed == 0) icon_state = "beartrap0" else icon_state = "beartrap1" From cb8a4c7d75602426a7fbeae22e47e860a20e831f Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 10 May 2015 22:03:10 +0100 Subject: [PATCH 5/6] Removes redundant proc call --- code/defines/obj/weapon.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 831cd68925e..81e132ad04a 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -235,7 +235,6 @@ affecting.take_damage(30, 0) affecting.embed(src) H.UpdateDamageIcon() - H.updatehealth() else var/list/potentialorgans = list() for(var/organ in list("l_leg", "r_leg", "l_foot", "r_foot")) @@ -246,7 +245,6 @@ affecting.take_damage(30, 0) affecting.embed(src) H.UpdateDamageIcon() - H.updatehealth() if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) From 9bdfeb5ab1d511ab7abf0f1aa534afd2c1c91a49 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 11 May 2015 13:16:07 +0100 Subject: [PATCH 6/6] Adds if statement --- code/defines/obj/weapon.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 81e132ad04a..c111edd39b9 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -232,9 +232,9 @@ O.show_message("[H] steps on \the [src].", 1) if(H.lying) var/obj/item/organ/external/affecting = pick(H.organs) - affecting.take_damage(30, 0) + if(affecting.take_damage(30, 0)) + H.UpdateDamageIcon() affecting.embed(src) - H.UpdateDamageIcon() else var/list/potentialorgans = list() for(var/organ in list("l_leg", "r_leg", "l_foot", "r_foot")) @@ -242,9 +242,9 @@ if(R && !(R.status & ORGAN_DESTROYED)) potentialorgans += R var/obj/item/organ/external/affecting = pick(potentialorgans) - affecting.take_damage(30, 0) + if(affecting.take_damage(30, 0)) + H.UpdateDamageIcon() affecting.embed(src) - H.UpdateDamageIcon() if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))