From b8a354467e931a0f27ff3d32b2ca4107326ff638 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Wed, 15 Jul 2015 18:27:27 +0300 Subject: [PATCH 1/4] Fixes #9967 Pulling someone through space or an area without gravity will no longer deal damage to them --- code/modules/mob/living/living.dm | 45 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3bf702b872..356473816b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -410,27 +410,30 @@ var/atom/movable/t = M.pulling M.stop_pulling() - //this is the gay blood on floor shit -- Added back -- Skie - if (M.lying && (prob(M.getBruteLoss() / 6))) - var/turf/location = M.loc - if (istype(location, /turf/simulated)) - location.add_blood(M) - //pull damage with injured people - if(prob(25)) - M.adjustBruteLoss(1) - visible_message("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!") - if(M.pull_damage()) - if(prob(25)) - M.adjustBruteLoss(2) - visible_message("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!") - var/turf/location = M.loc - if (istype(location, /turf/simulated)) - location.add_blood(M) - if(ishuman(M)) - var/mob/living/carbon/H = M - var/blood_volume = round(H:vessel.get_reagent_amount("blood")) - if(blood_volume > 0) - H:vessel.remove_reagent("blood",1) + if(!istype(M.loc, /turf/space)) + var/area/A = get_area(M) + if(A.has_gravity) + //this is the gay blood on floor shit -- Added back -- Skie + if (M.lying && (prob(M.getBruteLoss() / 6))) + var/turf/location = M.loc + if (istype(location, /turf/simulated)) + location.add_blood(M) + //pull damage with injured people + if(prob(25)) + M.adjustBruteLoss(1) + visible_message("\The [M]'s [M.isSynthetic() ? "state worsens": "wounds open more"] from being dragged!") + if(M.pull_damage()) + if(prob(25)) + M.adjustBruteLoss(2) + visible_message("\The [M]'s [M.isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!") + var/turf/location = M.loc + if (istype(location, /turf/simulated)) + location.add_blood(M) + if(ishuman(M)) + var/mob/living/carbon/H = M + var/blood_volume = round(H:vessel.get_reagent_amount("blood")) + if(blood_volume > 0) + H:vessel.remove_reagent("blood",1) step(pulling, get_dir(pulling.loc, T)) From 4e2049ccafc00bcf1e9a6bd867d9d3f0f1a0c8db Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sat, 18 Jul 2015 14:53:35 +0300 Subject: [PATCH 2/4] Removes a colon --- code/modules/mob/living/living.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 356473816b..972a69a492 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -430,10 +430,10 @@ if (istype(location, /turf/simulated)) location.add_blood(M) if(ishuman(M)) - var/mob/living/carbon/H = M - var/blood_volume = round(H:vessel.get_reagent_amount("blood")) + var/mob/living/carbon/human/H = M + var/blood_volume = round(H.vessel.get_reagent_amount("blood")) if(blood_volume > 0) - H:vessel.remove_reagent("blood",1) + H.vessel.remove_reagent("blood", 1) step(pulling, get_dir(pulling.loc, T)) From 8aac45bc426c5ca617a874e6da653dea87ac1bc0 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 18 Jul 2015 19:36:01 +0200 Subject: [PATCH 3/4] Fixes #10170. Overrides the AI attack proc. Saving any removal of burners for the dev branch due to merge concerns. --- code/modules/research/xenoarchaeology/tools/bunsen_burner.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm index 2437eeb067..6bb7091c40 100644 --- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm +++ b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm @@ -25,6 +25,9 @@ try_heating() else user << "\red You can't put the [W] onto the [src]." + +/obj/machinery/bunsen_burner/attack_ai() + return /obj/machinery/bunsen_burner/attack_hand(mob/user as mob) if(held_container) From 67a648094117721053a0061b0a58a3274a658fdf Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 18 Jul 2015 19:58:09 +0200 Subject: [PATCH 4/4] Fixes #10220. For the sake of consistency between mapped in and created phoron canisters, if nothing else. --- code/game/machinery/atmoalter/canister.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 47bf531d5e..3c1057e057 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -343,7 +343,7 @@ update_flag "\[N2O\]" = "redws", \ "\[N2\]" = "red", \ "\[O2\]" = "blue", \ - "\[Toxin (Bio)\]" = "orange", \ + "\[Phoron\]" = "orange", \ "\[CO2\]" = "black", \ "\[Air\]" = "grey", \ "\[CAUTION\]" = "yellow", \