From 3c06edc689c87783223e2068e4a5286fa91614c4 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 25 Jan 2013 11:48:17 +1000 Subject: [PATCH] resolved lying sprite issue for atmos hardsuits, hair being hidden behind atmos hardsuit helmets, normalised a bunch of values across hardsuits (slowdown, mainly) --- code/modules/clothing/spacesuits/rig.dm | 18 ++++++++---------- icons/mob/suit.dmi | Bin 249901 -> 249898 bytes 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index ff07fc01983..e812c35baa5 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -57,6 +57,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE + slowdown = 1.0 //Chief Engineer's rig @@ -70,6 +71,7 @@ icon_state = "rig-white" name = "advanced hardsuit" item_state = "ce_hardsuit" + slowdown = 1.0 //Mining rig @@ -83,6 +85,7 @@ icon_state = "rig-mining" name = "mining hardsuit" item_state = "mining_hardsuit" + slowdown = 1.0 //Syndicate rig @@ -92,6 +95,7 @@ item_state = "syndie_helm" color = "syndi" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) + slowdown = 1.0 /obj/item/clothing/suit/space/rig/syndi icon_state = "rig-syndi" @@ -102,6 +106,7 @@ armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + //Security rig /obj/item/clothing/head/helmet/space/rig/security name = "security hardsuit helmet" @@ -117,6 +122,8 @@ slowdown = 1 armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton) + slowdown = 1.0 + //Wizard Rig /obj/item/clothing/head/helmet/space/rig/wizard @@ -136,6 +143,7 @@ unacidable = 1 armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) + slowdown = 1.0 //Atmos Rig /obj/item/clothing/head/helmet/space/rig/atmos @@ -143,21 +151,11 @@ icon_state = "rig0-atmos" item_state = "atmos_helm" color = "atmos" - flags = STOPSPRESSUREDMAGE armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0) - gas_transfer_coefficient = 0 - permeability_coefficient = 0 - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE /obj/item/clothing/suit/space/rig/atmos icon_state = "rig-atmos" name = "atmospherics pressure suit" item_state = "atmos_hardsuit" - flags = STOPSPRESSUREDMAGE armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0) - gas_transfer_coefficient = 0 - permeability_coefficient = 0 slowdown = 1.0 - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 3dae01cfc853dbf6973e1ba24951d4149aa09f3c..f165af0475dbf08b69e16601b7bbe6f7a8f59913 100644 GIT binary patch delta 186 zcmV;r07d_;pbx5`50E4QkFh2G1b+#%h`q84Vgl9)TjM$MNHMsg@wa+4sEhyP;qbe@ z8q|#qvrG?H@AY@TlMUlqhDI3petX3OZ?~w@_pD`I`Xi?=t25tc@}qvnfO^p2plI2B zCNo5_w#pg@YEg~&uacKACT)Dzk+Z<|tY}QUV=D&uA=84zgy;GaQl4S3WEw=*dI`TP o{k8c1^Pzb7@woXPqRhnM_UT57gTDobzXbt@zXbxfzXbzs%8El{0RR91 delta 189 zcmV;u07Cz&pbxE}50E4QlCdTJ1b=y#ZV`KB7sLdt6Sl^I4)mEvioq3)ztyWjUHm5x zhu`(ppl)oKWqP=JufO}9Y#7%vG{V65+bbS;yG510XD#c}A31$lo%ueKAN4Z^)Pn{G zMa%9pnIVd`Rn|CAi)zGwmAr&8Y2&+&oCUULMPuR}TQR^7nHDT2JlB_y@*NC=B_q1l rOZZ*suf_MD55>ce$Ibtpi^SkBH~o%-yak861p$Y=1p>Fc1p{u%Ox#@w