From 2200ac8f476a573bf82e1196112e87706c804a11 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Fri, 6 Jun 2014 20:43:47 +0200 Subject: [PATCH 1/4] Fixes suit icons not updating when bloodied by airflow --- code/ZAS/Airflow.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 896cda8440b..55e2021c1a3 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -225,10 +225,7 @@ mob/living/carbon/human/airflow_hit(atom/A) // M.show_message("\red [src] slams into [A]!",1,"\red You hear a loud slam!",2) playsound(src.loc, "punch", 25, 1, -1) loc:add_blood(src) - if (src.wear_suit) - src.wear_suit.add_blood(src) - if (src.w_uniform) - src.w_uniform.add_blood(src) + bloody_body(src) var/b_loss = airflow_speed * vsc.airflow_damage var/blocked = run_armor_check("head","melee") From a522cf939901e7f7df27d0896fa174e4d8af97c9 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Fri, 6 Jun 2014 20:45:39 +0200 Subject: [PATCH 2/4] Fixes runtime error when copying the stamped EFTPOS paper --- code/modules/economy/EFTPOS.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 3812ab70c6a..98080d3872c 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -51,6 +51,9 @@ stampoverlay.icon_state = "paper_stamp-cent" if(!R.stamped) R.stamped = new + R.offset_x += 0 + R.offset_y += 0 + R.ico += "paper_stamp-cent" R.stamped += /obj/item/weapon/stamp R.overlays += stampoverlay R.stamps += "
This paper has been stamped by the EFTPOS device." From eb2f9f0de1ce1d3e28e341a5c763b1e39bfc130c Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Sat, 7 Jun 2014 04:43:58 +0200 Subject: [PATCH 3/4] Fixes stamp overlays being partly off the paper --- code/modules/paperwork/paper.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 7e16c426dbb..9dd5bdfc881 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -376,8 +376,13 @@ stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') - var/x = rand(-2, 2) - var/y = rand(-3, 2) + var/{x; y;} + if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) + x = rand(-2, 0) + y = rand(-1, 2) + else + x = rand(-2, 2) + y = rand(-3, 2) offset_x += x offset_y += y stampoverlay.pixel_x = x From 33917763dfa7035428d23ec6eb4f759cb1518910 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Sat, 7 Jun 2014 04:52:19 +0200 Subject: [PATCH 4/4] Probability to bleed by airflow_hit lowered from 100% to 33% --- code/ZAS/Airflow.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 55e2021c1a3..67ace07fe2a 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -224,8 +224,9 @@ mob/living/carbon/human/airflow_hit(atom/A) // for(var/mob/M in hearers(src)) // M.show_message("\red [src] slams into [A]!",1,"\red You hear a loud slam!",2) playsound(src.loc, "punch", 25, 1, -1) - loc:add_blood(src) - bloody_body(src) + if (prob(33)) + loc:add_blood(src) + bloody_body(src) var/b_loss = airflow_speed * vsc.airflow_damage var/blocked = run_armor_check("head","melee")