From 1aca0bff381b6e0d7f262bff479251febc76fb6c Mon Sep 17 00:00:00 2001 From: CameronWoof Date: Fri, 26 Jul 2019 20:13:09 -0700 Subject: [PATCH 1/3] Resprites Advanced Burn and Trauma Kits --- code/game/objects/items/stacks/medical.dm | 2 ++ code/game/objects/items/stacks/medical_vr.dm | 21 +++++++++++++++++++ icons/obj/stacks_vr.dmi | Bin 0 -> 614 bytes vorestation.dme | 1 + 4 files changed, 24 insertions(+) create mode 100644 code/game/objects/items/stacks/medical_vr.dm create mode 100644 icons/obj/stacks_vr.dmi diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 6a51e9eb17..612a14c4d4 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -220,6 +220,7 @@ W.heal_damage(heal_brute) playsound(src, pick(apply_sounds), 25) used = 1 //VOREStation Edit + update_icon() // VOREStation Edit - Support for stack icons affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) @@ -266,6 +267,7 @@ use(1) affecting.salve() playsound(src, pick(apply_sounds), 25) + update_icon() // VOREStation Edit - Support for stack icons /obj/item/stack/medical/splint name = "medical splints" diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm new file mode 100644 index 0000000000..9f0c8a9877 --- /dev/null +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -0,0 +1,21 @@ +/obj/item/stack/medical/advanced + icon = 'icons/obj/stacks_vr.dmi' + +/obj/item/stack/medical/advanced/New() + ..() + update_icon() + return + +/obj/item/stack/medical/advanced/update_icon() + if(amount <= 2) + icon_state = initial(icon_state) + else if (amount <= 4) + icon_state = "[initial(icon_state)]_4" + else if (amount <= 6) + icon_state = "[initial(icon_state)]_6" + else if (amount <= 8) + icon_state = "[initial(icon_state)]_8" + else if (amount <= 9) + icon_state = "[initial(icon_state)]_9" + else + icon_state = "[initial(icon_state)]_10" \ No newline at end of file diff --git a/icons/obj/stacks_vr.dmi b/icons/obj/stacks_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..76be4ea4ffc4a30e58f9ec68e03b94f92879edc6 GIT binary patch literal 614 zcmV-s0-61ZP)I`Sty@-5llD5^5PUxJ`qAPMBbg?00001 zbW%=J06^y0W&i*Hpn6nTbVOxyV{&P5bZKvH004NLQ&wOFooC|Z5kLYPhprPs2yxIC+W0UGAq?BwYEj#FeJq$ARQ6qeE0`Tr_Ira7 zbWqQK8;s-Vc2Ln@WCfb;f!;r;wf%Zbz!$_@gg!za&sQMa59~s656}nb!{_-vJgdfpbsi`)z<_ zS=TbPtgEJ|+L4BVY1+1o?h_>|^*mu#e$$_I%0j0p$Dju?x}bz%E3u?D_Vk zSO_765JCw0r;_$$zNha8*nCgl53t#e&W3EdrPDE+@9F!2Ypg)iJwWDr`hH-`?=#5v zdkfdk(4QQ`PkzrJ-|sD4pP{!4QS(wPgb@GA8{TCxoVQ4L^8f$<07*qoM6N<$f`5Yv AX#fBK literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 943cc3f515..5d83f2f7ae 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1027,6 +1027,7 @@ #include "code\game\objects\items\stacks\marker_beacons.dm" #include "code\game\objects\items\stacks\matter_synth.dm" #include "code\game\objects\items\stacks\medical.dm" +#include "code\game\objects\items\stacks\medical_vr.dm" #include "code\game\objects\items\stacks\nanopaste.dm" #include "code\game\objects\items\stacks\rods.dm" #include "code\game\objects\items\stacks\stack.dm" From 2cd2b7a981dc02ea3cec81fb0b9b033e16d05e91 Mon Sep 17 00:00:00 2001 From: CameronWoof Date: Fri, 26 Jul 2019 23:10:41 -0700 Subject: [PATCH 2/3] code compliance --- code/game/objects/items/stacks/medical_vr.dm | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm index 9f0c8a9877..887dc1e3cd 100644 --- a/code/game/objects/items/stacks/medical_vr.dm +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -1,21 +1,21 @@ /obj/item/stack/medical/advanced icon = 'icons/obj/stacks_vr.dmi' -/obj/item/stack/medical/advanced/New() +/obj/item/stack/medical/advanced/Initialize() ..() update_icon() - return /obj/item/stack/medical/advanced/update_icon() - if(amount <= 2) - icon_state = initial(icon_state) - else if (amount <= 4) - icon_state = "[initial(icon_state)]_4" - else if (amount <= 6) - icon_state = "[initial(icon_state)]_6" - else if (amount <= 8) - icon_state = "[initial(icon_state)]_8" - else if (amount <= 9) - icon_state = "[initial(icon_state)]_9" - else - icon_state = "[initial(icon_state)]_10" \ No newline at end of file + switch(amount) + if(1 to 2) + icon_state = initial(icon_state) + if(3 to 4) + icon_state = "[initial(icon_state)]_4" + if(5 to 6) + icon_state = "[initial(icon_state)]_6" + if(7 to 8) + icon_state = "[initial(icon_state)]_8" + if(9) + icon_state = "[initial(icon_state)]_9" + else + icon_state = "[initial(icon_state)]_10" \ No newline at end of file From 172314f04c819321fb698484444e6bfbee6dfef8 Mon Sep 17 00:00:00 2001 From: CameronWoof Date: Fri, 26 Jul 2019 23:43:11 -0700 Subject: [PATCH 3/3] more compliance --- code/game/objects/items/stacks/medical_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm index 887dc1e3cd..eda72a3fce 100644 --- a/code/game/objects/items/stacks/medical_vr.dm +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/stacks_vr.dmi' /obj/item/stack/medical/advanced/Initialize() - ..() + . = ..() update_icon() /obj/item/stack/medical/advanced/update_icon()