From 56c610e1118993ace31ecf9a1a88fc45a7b8649b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 11 May 2015 21:20:16 -0400 Subject: [PATCH 1/4] Updates weed control crate Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles. --- code/datums/supplypacks.dm | 10 ++++++++-- code/modules/hydroponics/trays/tray_tools.dm | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 59926a6e0b3..beedf6dca92 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -345,11 +345,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/weedcontrol name = "Weed control crate" - contains = list(/obj/item/weapon/scythe, + contains = list(/obj/item/weapon/hatchet, + /obj/item/weapon/hatchet, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/weapon/grenade/chem_grenade/antiweed, /obj/item/weapon/grenade/chem_grenade/antiweed) - cost = 20 + cost = 25 containertype = /obj/structure/closet/crate/secure/hydrosec containername = "Weed control crate" access = access_hydroponics diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index 67d630119a8..da6c996ac92 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -270,11 +270,3 @@ slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") - -/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity) - if(!proximity) return - if(istype(A, /obj/effect/plant)) - for(var/obj/effect/plant/B in orange(A,1)) - if(prob(80)) - B.die_off(1) - del A \ No newline at end of file From c952507f3cc77e327ee5ca47252c17ee0871e397 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Tue, 12 May 2015 15:53:28 +0100 Subject: [PATCH 2/4] Fixes carp attacking mechs over z-levels Fixes #9198. --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 03bf90b0f5f..aa29a02547b 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -115,7 +115,7 @@ var/list/L = hearers(src, dist) for (var/obj/mecha/M in mechas_list) - if (get_dist(src, M) <= dist) + if (M.z == src.z && get_dist(src, M) <= dist) L += M return L From 2bd9292b463966f0c981f1bdba38d453ec82474b Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Tue, 12 May 2015 13:42:18 -0400 Subject: [PATCH 3/4] Fix issue with alert monitor template not sending: Short version: We had two files that were exact matches, because of the way byond optimizes resoureces it only sends one file when the MD5 matches. We're not using atmosphere_monitor.tmpl anywhere in the code and it's just a copy of alarm_monitor.tmpl byond was sending atmosphere_monitor.tmpl instead of alarm_monitor.tmpl No copy / paste nanotemplates allowed, there must be SOMETHING different about them even if it's just comments. --- nano/templates/atmosphere_monitor.tmpl | 37 -------------------------- 1 file changed, 37 deletions(-) delete mode 100644 nano/templates/atmosphere_monitor.tmpl diff --git a/nano/templates/atmosphere_monitor.tmpl b/nano/templates/atmosphere_monitor.tmpl deleted file mode 100644 index 0089467e434..00000000000 --- a/nano/templates/atmosphere_monitor.tmpl +++ /dev/null @@ -1,37 +0,0 @@ - - -{{for data.categories}} -

{{:value.category}}

- {{for value.alarms :alarmValue:alarmIndex}} - {{if alarmValue.origin_lost}} - {{:alarmValue.name}} Alarm Origin Lost
- {{else}} - {{:alarmValue.name}}
- {{/if}} - {{if alarmValue.has_cameras || alarmValue.lost_sources != ""}} -
- {{if alarmValue.has_cameras}} -
- {{for alarmValue.cameras :cameraValue:cameraIndex}} - {{if cameraValue.deact}} - {{:helper.link(cameraValue.name + " (deactivated)", '', {}, 'inactive')}} - {{else}} - {{:helper.link(cameraValue.name, '', {'switchTo' : cameraValue.camera})}} - {{/if}} - {{/for}} -
- {{/if}} - {{if alarmValue.lost_sources != ""}} -
-

Lost Alarm Sources: {{:alarmValue.lost_sources}}

-
- {{/if}} -
- {{/if}} - {{empty}} - --All Systems Nominal - {{/for}} -{{/for}} \ No newline at end of file From d646e060e64a19c068ef5f25ad33f4d97c9b5022 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Tue, 12 May 2015 22:34:52 -0400 Subject: [PATCH 4/4] Re-adds Clowns. Changed the alarm_monitor.tmpl so that folks won't have to clear their cache to get the updated file if they have the old atmosphere_monitir.tmpl file in their cache. --- nano/templates/alarm_monitor.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nano/templates/alarm_monitor.tmpl b/nano/templates/alarm_monitor.tmpl index 0089467e434..2591763fc04 100644 --- a/nano/templates/alarm_monitor.tmpl +++ b/nano/templates/alarm_monitor.tmpl @@ -1,6 +1,7 @@ {{for data.categories}} @@ -34,4 +35,4 @@ Used In File(s): \code\modules\nano\modules\alarm_monitor.dm {{empty}} --All Systems Nominal {{/for}} -{{/for}} \ No newline at end of file +{{/for}}