From b0d10a650841dcd7ee26a4e3373f72ff696df725 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 10 May 2015 20:15:19 +0100 Subject: [PATCH] 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)