From c03746d8c33d25c675dd00d249f0621fc71f1702 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Mon, 14 Aug 2017 16:29:52 -0500 Subject: [PATCH 1/5] Fix chemsmoke GC (#3284) Should eliminate the GC lag from vent clog events. --- code/game/objects/effects/chem/chemsmoke.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 1c19a392c3d..83bf045f9ce 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -29,6 +29,10 @@ if(destination) walk_to(src, destination) +/obj/effect/effect/smoke/chem/Destroy() + walk(src, 0) + return ..() + /obj/effect/effect/smoke/chem/Move() var/list/oldlocs = view(1, src) . = ..() From 827b57c7cd3d9441617f198962d07bfcf6ee94ef Mon Sep 17 00:00:00 2001 From: Lohikar Date: Mon, 14 Aug 2017 16:35:36 -0500 Subject: [PATCH 2/5] Vaurca organ fixes (#3264) Fixes some errors in Vaurca organ definitions causing them to get more organs than seems to have originally been intended. changes: Vaurca now have two hearts ("left heart" and "right heart") instead of three ("left heart", "heart", and "second heart"). Vaurca now have only one set of lungs. --- .../carbon/human/species/station/station.dm | 43 ++++++++++--------- html/changelogs/lohikar-vaurcaorgans.yml | 4 ++ 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/lohikar-vaurcaorgans.yml diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index bff76d93d4e..128adfccc12 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -592,7 +592,12 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) icobase = 'icons/mob/human_races/r_vaurca.dmi' deform = 'icons/mob/human_races/r_vaurca.dmi' name_language = LANGUAGE_VAURCA - unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) + unarmed_types = list( + /datum/unarmed_attack/stomp, + /datum/unarmed_attack/kick, + /datum/unarmed_attack/claws, + /datum/unarmed_attack/bite/sharp + ) meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/bug rarity_value = 4 slowdown = 1 @@ -636,37 +641,35 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) death_message = "chitters faintly before crumbling to the ground, their eyes dead and lifeless..." halloss_message = "crumbles to the ground, too weak to continue fighting." - list/heat_discomfort_strings = list( + heat_discomfort_strings = list( "Your blood feels like its boiling in the heat.", "You feel uncomfortably warm.", "Your carapace feels hot as the sun." - ) - list/cold_discomfort_strings = list( + ) + + cold_discomfort_strings = list( "You chitter in the cold.", "You shiver suddenly.", "Your carapace is ice to the touch." - ) + ) - stamina = 100 // Long period of sprinting, but relatively low speed gain + stamina = 100 // Long period of sprinting, but relatively low speed gain sprint_speed_factor = 0.7 sprint_cost_factor = 0.30 - stamina_recovery = 2//slow recovery - + stamina_recovery = 2 //slow recovery has_organ = list( - "neural socket" = /obj/item/organ/vaurca/neuralsocket, - "lungs" = /obj/item/organ/lungs, - "filtration bit" = /obj/item/organ/vaurca/filtrationbit, - "lungs" = /obj/item/organ/lungs, - "heart" = /obj/item/organ/heart, + "neural socket" = /obj/item/organ/vaurca/neuralsocket, + "lungs" = /obj/item/organ/lungs, + "filtration bit" = /obj/item/organ/vaurca/filtrationbit, + "right heart" = /obj/item/organ/heart/right, + "left heart" = /obj/item/organ/heart/left, "phoron reserve tank" = /obj/item/organ/vaurca/preserve, - "second heart" = /obj/item/organ/heart, - "left heart" = /obj/item/organ/heart/left, - "liver" = /obj/item/organ/liver, - "kidneys" = /obj/item/organ/kidneys, - "brain" = /obj/item/organ/brain, - "eyes" = /obj/item/organ/eyes - ) + "liver" = /obj/item/organ/liver, + "kidneys" = /obj/item/organ/kidneys, + "brain" = /obj/item/organ/brain, + "eyes" = /obj/item/organ/eyes + ) /datum/species/bug/equip_survival_gear(var/mob/living/carbon/human/H) ..() diff --git a/html/changelogs/lohikar-vaurcaorgans.yml b/html/changelogs/lohikar-vaurcaorgans.yml new file mode 100644 index 00000000000..b390f9e01bf --- /dev/null +++ b/html/changelogs/lohikar-vaurcaorgans.yml @@ -0,0 +1,4 @@ +author: Lohikar +delete-after: True +changes: + - bugfix: "Vaurca now have two hearts and one set of lungs as was originally intended instead of three hearts and two sets of lungs." From 16ac2d1cf912a3d4fdefb9b251320329b1079e27 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 14 Aug 2017 18:40:58 -0300 Subject: [PATCH 3/5] plant taste fix (#3285) What it says on the title. --- code/modules/hydroponics/grown.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 1c47da8e49a..2f3d9abf109 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -50,10 +50,10 @@ if(reagent_data && reagent_data.len) var/rtotal = reagent_data[1] var/list/data = list() - if(rid == "nutriment") - data += "[seed.seed_name]" if(reagent_data.len > 1 && potency > 0) rtotal += round(potency/reagent_data[2]) + if(rid == "nutriment") + data[seed.seed_name] = max(1,rtotal) reagents.add_reagent(rid,max(1,rtotal),data) update_desc() if(reagents.total_volume > 0) From 0806095d6b3fe356be5ec7bea7dd2d41132d8e61 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 15 Aug 2017 16:46:12 -0300 Subject: [PATCH 4/5] Fixes slowdown applying on open spaces (#3282) With this change you won't be slowed anymore while floating on an open space, such as using a jetpack. --- code/modules/mob/living/carbon/human/human_movement.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index c82194cfc71..2cc88bff67a 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -6,6 +6,10 @@ if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything + if (isopenturf(loc) && !has_gravity(src, loc)) //open space checks + if(!(locate(/obj/structure/lattice, loc) || locate(/obj/structure/stairs, loc) || locate(/obj/structure/ladder, loc))) + return -1 + if(embedded_flag) handle_embedded_objects() //Moving with objects stuck in you can cause bad times. From a66846a3dcc393fab3c615286e7d3681a1bf29b5 Mon Sep 17 00:00:00 2001 From: skull132 Date: Tue, 15 Aug 2017 22:59:41 +0300 Subject: [PATCH 5/5] Changelogs, 15AUG2017 --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/lohikar-vaurcaorgans.yml | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/lohikar-vaurcaorgans.yml diff --git a/html/changelog.html b/html/changelog.html index b1ae491df07..4aaa8fdc014 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

15 August 2017

+

Lohikar updated:

+
    +
  • Vaurca now have two hearts and one set of lungs as was originally intended instead of three hearts and two sets of lungs.
    • +
+

13 August 2017

Lohikar updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d0e0056660f..85da2ef479e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4530,3 +4530,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Cryopods no longer act as impromptu teleportation devices. - bugfix: Fixed a bug which caused space parallax to always be static, regardless of preferences. +2017-08-15: + Lohikar: + - bugfix: Vaurca now have two hearts and one set of lungs as was originally intended + instead of three hearts and two sets of lungs. diff --git a/html/changelogs/lohikar-vaurcaorgans.yml b/html/changelogs/lohikar-vaurcaorgans.yml deleted file mode 100644 index b390f9e01bf..00000000000 --- a/html/changelogs/lohikar-vaurcaorgans.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Lohikar -delete-after: True -changes: - - bugfix: "Vaurca now have two hearts and one set of lungs as was originally intended instead of three hearts and two sets of lungs."