From 3b935ce854861ec55cf2658d318cc52e256aa49b Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 23 Jun 2015 18:15:30 +0200 Subject: [PATCH 1/3] Fixes #9813. Cutting fire alarm wiring now produces cables. --- code/game/machinery/alarm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 7d9b605585..b4e6c892eb 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -990,6 +990,7 @@ FIRE ALARM user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") else if (istype(W, /obj/item/weapon/wirecutters)) user.visible_message("\red [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") + new/obj/item/stack/cable_coil(get_turf(src), 5) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) buildstage = 1 update_icon() From aa0b23e205d8ff15b45e78442ba220ab18140f77 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 24 Jun 2015 00:20:11 -0400 Subject: [PATCH 2/3] Fixes #9910 --- code/game/objects/structures/grille.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 7829705a63..569a4eb3b9 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -157,9 +157,7 @@ return //window placing end - else if(istype(W, /obj/item/weapon/material/shard)) - health -= W.force * 0.1 - else if(!shock(user, 70)) + else if(!(W.flags & CONDUCT) || !shock(user, 70)) user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) switch(W.damtype) From 0e471be0e6c6299efa08e9e3223f5d2b52415d7b Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 24 Jun 2015 17:31:07 +0200 Subject: [PATCH 3/3] Updates changelog. --- html/changelogs/.all_changelog.yml | 44 +++++++++++++++++++++++ html/changelogs/HarpyEagle-dev-freeze.yml | 22 +----------- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index aef75f37bd..2661935993 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1898,3 +1898,47 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Knifing switches on harm intent, in case you just wanted to beat on the victim for some reason. - bugfix: Prevents knifing bots or silicons. +2015-06-24: + HarpyEagle: + - bugfix: Fixed Tajaran name generation producing names without a space between + first and last. + - wip: Adds docking to the mercenary shuttle. Works similarly to other shuttles, + except docking and undocking is manually initiated and not automatic. A system + to approve or deny dock requests still to be implemented. + - rscadd: Toolboxes can now hold larger items, such as stacks of metal or power + cells, at the cost of having less space for other things. + - tweak: Gloves/shoes can now be worn even if you have one hand/foot missing. The + other one still has to be present, of course. The items still drop when you + first lose the hand/foot. + - tweak: Budget insulated gloves are somewhat less useless. On average, they will + stop half the damage from getting shocked, and the worst case insulation is + not as bad as it used to be. Budget gloves that are as good as regular insulated + gloves are still as rare as they were before though. + - tweak: PTR bullets are now hitscan, to make them somewhat better for actual sniping. + - maptweak: The telecoms server room now has an actual cycling airlock into it. + - tweak: Non-vital body parts will no longer take further damage above a certain + amount, and will inflict paincrit effects instead. On most humaniods the head, + chest, and groin are vital. + - rscadd: 'Engineers now spawn with industrial workboots (credit: ChessPiece/Bishop).' + - bugfix: Damaged robotic legs now more likely to have an effect. + - bugfix: Fixed bug preventing internal organs from taking damage in some cases. + - maptweak: New flavours of tables around the station. Engineering starts with more + plastic. + - bugfix: Fixed worn items not appearing in some cases. Most notably crossbows and + certain guns when worn on the back. As a side effect, laundry machines no longer + transform items. + - bugfix: Crit oxyloss now runs in game time instead of real time. So if lag is + slowing your movement the same slowdown applies to the dying person you're trying + to reach. + - rscadd: Breathmasks can now be adjusted by clicking on them in your hand, in addition + to the verb. + - rscadd: Wearing a space helmet or similar face-covering gear now prevents eating + and force-feeding food, drink, and pills. + - rscadd: Phoron in air ignites above it's flashpoint temperature and a certain + (very small) minimum concentration. Environments that have oxygen and are hot + enough, and have phoron but not enough concentration to burn will produce flareouts, + which are mostly a visual effect. + - rscadd: Adds animation when making unarmed attacks or attacking with melee weapons, + to help make it clearer who is attacking. + - soundadd: Opening an unpowered door now has an appropriate sound. + - rscadd: Ingesting diseased blood may contract the disease. diff --git a/html/changelogs/HarpyEagle-dev-freeze.yml b/html/changelogs/HarpyEagle-dev-freeze.yml index 54034a2535..a999f1236d 100644 --- a/html/changelogs/HarpyEagle-dev-freeze.yml +++ b/html/changelogs/HarpyEagle-dev-freeze.yml @@ -1,23 +1,3 @@ author: HarpyEagle +changes: [] delete-after: false -changes: - - bugfix: "Fixed Tajaran name generation producing names without a space between first and last." - - wip: "Adds docking to the mercenary shuttle. Works similarly to other shuttles, except docking and undocking is manually initiated and not automatic. A system to approve or deny dock requests still to be implemented." - - rscadd: "Toolboxes can now hold larger items, such as stacks of metal or power cells, at the cost of having less space for other things." - - tweak: "Gloves/shoes can now be worn even if you have one hand/foot missing. The other one still has to be present, of course. The items still drop when you first lose the hand/foot." - - tweak: "Budget insulated gloves are somewhat less useless. On average, they will stop half the damage from getting shocked, and the worst case insulation is not as bad as it used to be. Budget gloves that are as good as regular insulated gloves are still as rare as they were before though." - - tweak: "PTR bullets are now hitscan, to make them somewhat better for actual sniping." - - maptweak: "The telecoms server room now has an actual cycling airlock into it." - - tweak: "Non-vital body parts will no longer take further damage above a certain amount, and will inflict paincrit effects instead. On most humaniods the head, chest, and groin are vital." - - rscadd: "Engineers now spawn with industrial workboots (credit: ChessPiece/Bishop)." - - bugfix: "Damaged robotic legs now more likely to have an effect." - - bugfix: "Fixed bug preventing internal organs from taking damage in some cases." - - maptweak: "New flavours of tables around the station. Engineering starts with more plastic." - - bugfix: "Fixed worn items not appearing in some cases. Most notably crossbows and certain guns when worn on the back. As a side effect, laundry machines no longer transform items." - - bugfix: "Crit oxyloss now runs in game time instead of real time. So if lag is slowing your movement the same slowdown applies to the dying person you're trying to reach." - - rscadd: "Breathmasks can now be adjusted by clicking on them in your hand, in addition to the verb." - - rscadd: "Wearing a space helmet or similar face-covering gear now prevents eating and force-feeding food, drink, and pills." - - rscadd: "Phoron in air ignites above it's flashpoint temperature and a certain (very small) minimum concentration. Environments that have oxygen and are hot enough, and have phoron but not enough concentration to burn will produce flareouts, which are mostly a visual effect." - - rscadd: "Adds animation when making unarmed attacks or attacking with melee weapons, to help make it clearer who is attacking." - - soundadd: "Opening an unpowered door now has an appropriate sound." - - rscadd: "Ingesting diseased blood may contract the disease." \ No newline at end of file