From 8d6dd62ad2d4a3c5987db54b02942bd4c2fa29a2 Mon Sep 17 00:00:00 2001 From: Werner Date: Thu, 1 Feb 2018 00:51:02 +0100 Subject: [PATCH 01/16] Removes Goebbles from name list (#4228) --- config/names/last.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/config/names/last.txt b/config/names/last.txt index 5b41e53aae8..6080967e2da 100644 --- a/config/names/last.txt +++ b/config/names/last.txt @@ -502,7 +502,6 @@ Stamos Sagan Hawking Dawkins -Goebbles McShain McDonohugh Power From a25a395d246fa897037303d8ef8b05b572654ebb Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 2 Feb 2018 12:47:48 -0200 Subject: [PATCH 02/16] Balances k'ois a bit (#4240) -remove kois from the botany's seed storage -sharp or weapons that deal fire damage are twice as effective in destroying plants --- code/modules/hydroponics/seed_storage.dm | 3 +-- code/modules/hydroponics/trays/tray.dm | 5 ++++- html/changelogs/alberyk-nokois.yml | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-nokois.yml diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 760231710bc..9fa19851ae8 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -74,8 +74,7 @@ /obj/item/seeds/towermycelium = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, - /obj/item/seeds/whitebeetseed = 3, - /obj/item/seeds/koisspore = 3 + /obj/item/seeds/whitebeetseed = 3 ) /obj/machinery/seed_storage/xenobotany diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index daf28aad10b..479b4a0a55a 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -579,7 +579,10 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message("\The [seed.display_name] has been attacked by [user] with \the [O]!") if(!dead) - health -= O.force + var/total_damage = O.force + if ((O.sharp) || (O.damtype == "fire")) //fire and sharp things are more effective when dealing with plants + total_damage = 2*O.force + health -= total_damage check_health() return diff --git a/html/changelogs/alberyk-nokois.yml b/html/changelogs/alberyk-nokois.yml new file mode 100644 index 00000000000..deba6d68fe0 --- /dev/null +++ b/html/changelogs/alberyk-nokois.yml @@ -0,0 +1,5 @@ +author: Alberyk +delete-after: True +changes: + - rscadd: "Sharp weapons and welders are twice as effective in destroying plants." + - rscdel: "Removed k'ois seeds from the botany's seed storage." From 49eaa801a8240ed77132a4728900ef7274dceae9 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 2 Feb 2018 15:49:36 +0100 Subject: [PATCH 03/16] Should fix the ed209 attacking guard dogs (#4233) --- code/modules/mob/mob_helpers.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b98c4397268..98bd0d27214 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -670,12 +670,13 @@ proc/is_blind(A) /mob/living/simple_animal/hostile/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest) var/threatcount = ..() - if(. == SAFE_PERP) + if(threatcount == SAFE_PERP) return SAFE_PERP - if(!istype(src, /mob/living/simple_animal/hostile/retaliate/goat)) - threatcount += 4 - return threatcount + if(istype(src, /mob/living/simple_animal/hostile/retaliate/goat) || istype(src, /mob/living/simple_animal/hostile/commanded)) + return threatcount + + return threatcount + 4 /mob/living/proc/bucklecheck(var/mob/living/user) From faf9d48fec0d0210c955bab87a5c93f6d944b56d Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 3 Feb 2018 19:33:28 -0200 Subject: [PATCH 04/16] Fixes brig timers, medboots and titanium (#4241) -fixes #4216 -fixes #4239 -fixes titanium being the same thing as plasteel -fixes drop pods not working when you select a ghost --- code/game/machinery/doors/brigdoors.dm | 5 ++++- code/modules/materials/materials.dm | 4 ++++ code/modules/mob/living/bot/medbot.dm | 2 +- code/modules/random_map/drop/droppod.dm | 5 +---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 81f782eb695..89058dbee8b 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -38,8 +38,11 @@ var/datum/browser/menu = new( null, "brig_timer", "Brig Timer", 400, 300 ) /obj/machinery/door_timer/Initialize() - . = ..() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/door_timer/LateInitialize() for(var/obj/machinery/door/window/brigdoor/M in SSmachinery.all_machines) if (M.id == src.id) targets += M diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index d2dc327a3c7..94d627fdedc 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -408,7 +408,11 @@ var/list/name_to_material /material/plasteel/titanium name = "titanium" stack_type = /obj/item/stack/material/titanium + integrity = 600 conductivity = 2.38 + hardness = 90 + weight = 25 + protectiveness = 25 icon_base = "metal" door_icon_base = "metal" icon_colour = "#D1E6E3" diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 47f2798aaf1..b73c563a54a 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -303,7 +303,7 @@ if((H.getToxLoss() >= heal_threshold) && (!H.reagents.has_reagent(treatment_tox))) return treatment_tox - for(var/datum/disease/D in H.viruses) + for(var/datum/disease2/disease/D in H.virus2) if (!H.reagents.has_reagent(treatment_virus)) return treatment_virus // STOP DISEASE FOREVER diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm index f4a37290f00..15d7153febf 100644 --- a/code/modules/random_map/drop/droppod.dm +++ b/code/modules/random_map/drop/droppod.dm @@ -210,10 +210,7 @@ // Chuck them into the pod. var/automatic_pod if(spawned_mob && selected_player) - if(selected_player.mob.mind) - selected_player.mob.mind.transfer_to(spawned_mob) - else - spawned_mob.ckey = selected_player.mob.ckey + spawned_mob.ckey = selected_player.mob.ckey spawned_mobs = list(spawned_mob) message_admins("[key_name_admin(usr)] dropped a pod containing \the [spawned_mob] ([spawned_mob.key]) at ([usr.x],[usr.y],[usr.z])") log_admin("[key_name(usr)] dropped a pod containing \the [spawned_mob] ([spawned_mob.key]) at ([usr.x],[usr.y],[usr.z])",admin_key=key_name(usr),ckey=key_name(spawned_mob)) From aa1278c38f62dd15472be1d264b9165174161991 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Sat, 3 Feb 2018 17:08:35 -0500 Subject: [PATCH 05/16] Nerfs K'ois (#4250) Based on data collected from feedback reports submitted by the community, some additional although minor changes to the present K'ois mechanics. A few larger changes are pending discussion but should not delay this PR. -Halves K'ois Health -Reduces Black K'ois health by 25% -The number of spores released by a plant is now determined by that plant's potency. K'ois will be default release at most 2 spores, Black K'ois at most 3. --- code/game/objects/effects/chem/chemsmoke.dm | 4 ++- code/modules/hydroponics/seed_datums.dm | 2 ++ html/changelogs/kois.yml | 38 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/kois.yml diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 647a9bd4ab9..d0e2656a5dc 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -228,6 +228,7 @@ /datum/effect/effect/system/smoke_spread/chem/spores/start() ..() if(seed.get_trait(TRAIT_SPREAD)) + var/sporecount = 0 for(var/turf/T in targetTurfs) var/bad_turf = 0 for(var/obj/O in T) @@ -236,8 +237,9 @@ break if(bad_turf) continue - if(prob(min(seed.get_trait(TRAIT_POTENCY),50))) + if(prob(min(seed.get_trait(TRAIT_POTENCY),50)) && sporecount < max(1,round(seed.get_trait(TRAIT_POTENCY)/20),1)) new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(T,seed) + sporecount++ //------------------------------------------ diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index a762be0eb73..1927e238ee1 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -401,6 +401,7 @@ set_trait(TRAIT_BIOLUM,1) set_trait(TRAIT_IDEAL_LIGHT,1) set_trait(TRAIT_LIGHT_TOLERANCE,2) + set_trait(TRAIT_ENDURANCE,50) set_trait(TRAIT_BIOLUM_COLOUR,"#E6E600") set_trait(TRAIT_PRODUCT_ICON,"alien3") set_trait(TRAIT_PRODUCT_COLOUR,"#E6E600") @@ -418,6 +419,7 @@ ..() set_trait(TRAIT_BIOLUM_PWR,-1.5) set_trait(TRAIT_POTENCY,60) + set_trait(TRAIT_ENDURANCE,75) set_trait(TRAIT_IDEAL_LIGHT,0) set_trait(TRAIT_LIGHT_TOLERANCE,8) set_trait(TRAIT_BIOLUM_COLOUR,"#FFFFFF") diff --git a/html/changelogs/kois.yml b/html/changelogs/kois.yml new file mode 100644 index 00000000000..c91fa9eb4d5 --- /dev/null +++ b/html/changelogs/kois.yml @@ -0,0 +1,38 @@ +################################ +# 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 +# balance +################################# + +# Your name. +author: LordFowl + +# 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: "The number of spores released by a plant is now dependent on the plants potency." + - balance: "K'ois health has been reduced by half." From 8529171647991d9725cd6eb38e1404c86ddf920a Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 3 Feb 2018 20:08:46 -0200 Subject: [PATCH 06/16] Buff landmines (#4243) Their explosion was really weak and underwelding, this should make them a bit more powerful. --- code/game/objects/items/weapons/landmines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm index 1b7bed7fea0..29a35e8d05d 100644 --- a/code/game/objects/items/weapons/landmines.dm +++ b/code/game/objects/items/weapons/landmines.dm @@ -50,7 +50,7 @@ spark(src, 3, alldirs) if(ishuman(L)) L.Weaken(2) - explosion(loc, 0, 1, 2, 3) + explosion(loc, 0, 2, 2, 3) qdel(src) /obj/item/weapon/landmine/Crossed(AM as mob|obj) From 2846c3ea4d15e510af91a97e0a60237c7d4e42bb Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 4 Feb 2018 00:10:23 +0200 Subject: [PATCH 07/16] Changelogs, 03FEB2018 --- html/changelog.html | 12 ++++++++++ html/changelogs/.all_changelog.yml | 8 +++++++ html/changelogs/alberyk-nokois.yml | 5 ---- html/changelogs/kois.yml | 38 ------------------------------ 4 files changed, 20 insertions(+), 43 deletions(-) delete mode 100644 html/changelogs/alberyk-nokois.yml delete mode 100644 html/changelogs/kois.yml diff --git a/html/changelog.html b/html/changelog.html index 59cae6eb432..5eeda39e7ca 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,18 @@ -->
+

04 February 2018

+

Alberyk updated:

+
    +
  • Sharp weapons and welders are twice as effective in destroying plants.
    • +
  • Removed k'ois seeds from the botany's seed storage.
    • +
+

LordFowl updated:

+
    +
  • The number of spores released by a plant is now dependent on the plants potency.
    • +
  • K'ois health has been reduced by half.
    • +
+

31 January 2018

LordFowl updated: