From edbec1962ff0a93d38059ad7b9f87765bc161c66 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Sun, 17 Apr 2016 14:09:31 +0100 Subject: [PATCH] Fixes #263, #235. Tweaks ED Asides from two small bugfixes, adjusts Emergency Doors. --- code/game/machinery/doors/firedoor.dm | 3 ++- code/game/objects/items/weapons/material/shards.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../carbon/human/species/xenomorphs/alien_facehugger.dm | 4 ++-- html/changelogs/[Lord Lag] - [Multiple fixes].yml | 8 ++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/[Lord Lag] - [Multiple fixes].yml diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index a3131c649ba..10020ec0dee 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -147,11 +147,12 @@ for(var/area/A in areas_added) //Checks if there are fire alarms in any areas associated with that firedoor if(A.fire || A.air_doors_activated) alarmed = 1 - +/* var/answer = alert(user, "Would you like to [density ? "open" : "close"] this [src.name]?[ alarmed && density ? "\nNote that by doing so, you acknowledge any damages from opening this\n[src.name] as being your own fault, and you will be held accountable under the law." : ""]",\ "\The [src]", "Yes, [density ? "open" : "close"]", "No") if(answer == "No") return + */ if(user.stat || user.stunned || user.weakened || user.paralysis || (!user.canmove && !user.isSilicon()) || (get_dist(src, user) > 1 && !isAI(user))) user << "Sorry, you must remain able bodied and close to \the [src] in order to use it." return diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index b4c12f5ad1b..eac44eba6f2 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -68,7 +68,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC || (H.species.siemens_coefficient<0.5)) //Thick skin. + if(H.species.flags & IS_SYNTHETIC || (H.species.siemens_coefficient<0.5) || (H.species.name == "Vaurca")) //Thick skin. return if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) ) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 293be2d0dda..2463c77638f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -260,7 +260,7 @@ proc/handle_mutations_and_radiation() - if(species.flags & IS_SYNTHETIC || species.name == "Vaurca") //Robots/bugs don't suffer from mutations or radloss. + if(species.flags & IS_SYNTHETIC || species.name == "Vaurca") //Robots & bugs don't suffer from mutations or radloss. return if(getFireLoss()) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm index 34455a47a11..ddd48248a2a 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm @@ -127,14 +127,14 @@ var/const/MAX_ACTIVE_TIME = 400 L.visible_message("\red \b [src] leaps at [L]'s face!") - /* Tentatively removed since huggers can't be thrown anymore + if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.head && H.head.flags & HEADCOVERSMOUTH) H.visible_message("\red \b [src] smashes against [H]'s [H.head]!") Die() return - */ + if(iscarbon(M)) var/mob/living/carbon/target = L diff --git a/html/changelogs/[Lord Lag] - [Multiple fixes].yml b/html/changelogs/[Lord Lag] - [Multiple fixes].yml new file mode 100644 index 00000000000..ca63f53dfe1 --- /dev/null +++ b/html/changelogs/[Lord Lag] - [Multiple fixes].yml @@ -0,0 +1,8 @@ +author: Lord Lag + +delete-after: True + +changes: + - tweak: "Emergency Shutters no longer have alert pop-ups." + - bugfix: "Xenomorph facehuggers now react to protection properly." + - bugfix: "Vaurca Insulation fixed."