From b648c31d83896c7928d994a8b95204ea78f09111 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 25 Dec 2014 15:46:48 -0500 Subject: [PATCH 1/4] Fixes #7111 --- code/modules/recycling/disposal.dm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 04fa4f6b7a..396d92a200 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -364,18 +364,13 @@ if(flush && air_contents.return_pressure() >= SEND_PRESSURE ) // flush can happen even without power flush() - if(mode != 1) // if off or ready, no need to charge + if(mode != 1) //if off or ready, no need to charge update_use_power(1) - return - - // otherwise charge - src.pressurize() - - // if full enough, switch to ready mode - if(air_contents.return_pressure() >= SEND_PRESSURE) - mode = 2 + else if(air_contents.return_pressure() >= SEND_PRESSURE) + mode = 2 //if full enough, switch to ready mode update() - return + else + src.pressurize() //otherwise charge /obj/machinery/disposal/proc/pressurize() if(stat & NOPOWER) // won't charge if no power From f8ec11ddb2b66fffe391a3b781d7e7c9ef3b7ec2 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 25 Dec 2014 22:02:39 -0500 Subject: [PATCH 2/4] Fixes traumatic_shock affecting species with NO_PAIN --- .../mob/living/carbon/human/human_movement.dm | 23 +++++++++---------- code/modules/mob/living/carbon/shock.dm | 4 ++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index c5436aa48f..bf4f337d7e 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -26,7 +26,16 @@ if(wear_suit) tally += wear_suit.slowdown - if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair))) + if(istype(buckled, /obj/structure/stool/bed/chair/wheelchair)) + for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm")) + var/datum/organ/external/E = get_organ(organ_name) + if(!E || (E.status & ORGAN_DESTROYED)) + tally += 4 + if(E.status & ORGAN_SPLINTED) + tally += 0.5 + else if(E.status & ORGAN_BROKEN) + tally += 1.5 + else if(shoes) tally += shoes.slowdown @@ -38,17 +47,7 @@ tally += 0.5 else if(E.status & ORGAN_BROKEN) tally += 1.5 - - if(buckled && istype(buckled, /obj/structure/stool/bed/chair/wheelchair)) - for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm")) - var/datum/organ/external/E = get_organ(organ_name) - if(!E || (E.status & ORGAN_DESTROYED)) - tally += 4 - if(E.status & ORGAN_SPLINTED) - tally += 0.5 - else if(E.status & ORGAN_BROKEN) - tally += 1.5 - + if(shock_stage >= 10) tally += 3 if(FAT in src.mutations) diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm index 9ea6557485..b76b7a49b7 100644 --- a/code/modules/mob/living/carbon/shock.dm +++ b/code/modules/mob/living/carbon/shock.dm @@ -3,6 +3,10 @@ // proc to find out in how much pain the mob is at the moment /mob/living/carbon/proc/updateshock() + if (species && (species.flags & NO_PAIN)) + src.traumatic_shock = 0 + return 0 + src.traumatic_shock = \ 1 * src.getOxyLoss() + \ 0.7 * src.getToxLoss() + \ From f84759ee5f3eee9276672ee3aa38497d5242d21e Mon Sep 17 00:00:00 2001 From: Meyar Date: Fri, 26 Dec 2014 01:32:48 -0500 Subject: [PATCH 3/4] Fixes DeathSquad helmet to be spaceproof once more. --- code/modules/clothing/spacesuits/miscellaneous.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 9aa180912c..cc6cbd622b 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -33,8 +33,9 @@ desc = "That's not red paint. That's real blood." icon_state = "deathsquad" item_state = "deathsquad" - armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.2 + armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60) + flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL + siemens_coefficient = 0.6 /obj/item/clothing/head/helmet/space/deathsquad/beret name = "officer's beret" From 116b04dbf5fd614c7278362bee91cb853c4205cc Mon Sep 17 00:00:00 2001 From: Meyar Date: Fri, 26 Dec 2014 01:33:29 -0500 Subject: [PATCH 4/4] Fixes Deathsquad suit to be spaceproof again --- code/modules/clothing/suits/armor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 40540f5050..f5c9f4501e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -71,15 +71,15 @@ item_state = "swat_suit" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) slowdown = 1 - armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 0, rad = 0) + armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 100) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - siemens_coefficient = 0.5 + siemens_coefficient = 0.6 /obj/item/clothing/suit/armor/swat/officer