From 2cdec12e11dfc39e63a48cab0ae1607b7c09975b Mon Sep 17 00:00:00 2001 From: viv_eret Date: Sun, 24 Jul 2016 16:24:08 -0700 Subject: [PATCH 1/8] Adds horsehalf saddlebag in loadout. Shouuuld let you get a bag sprited for horsetaurs in loadout accessories. --- .../objects/items/weapons/storage/backpack_vr.dm | 8 ++++++++ .../loadout/loadout_accessories_vr.dm | 7 ++++++- icons/mob/back _vr.dmi | Bin 0 -> 417 bytes icons/obj/storage_vr.dmi | Bin 0 -> 312 bytes vorestation.dme | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/items/weapons/storage/backpack_vr.dm create mode 100644 icons/mob/back _vr.dmi create mode 100644 icons/obj/storage_vr.dmi diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm new file mode 100644 index 00000000000..1906c0f8576 --- /dev/null +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -0,0 +1,8 @@ +//Taur Bags +/obj/item/weapon/storage/backpack/saddlebag + name = "Saddlebag" + desc = "A saddle that holds items." + icon = 'icons\obj\storage_vr.dmi' + icon_override = 'icons/mob/back_vr.dmi' + item_state = "saddlebag" + icon_state = "saddlebag" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 19d640fe56c..54626143b7e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -30,4 +30,9 @@ allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") /datum/gear/accessory/white_vest - allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") \ No newline at end of file + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") + +/datum/gear/accessory/saddlebag + display_name = "Saddle Bag" + path = /obj/item/weapon/storage/backpack/saddlebag + slot = slot_back diff --git a/icons/mob/back _vr.dmi b/icons/mob/back _vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d3edee02d22cad4e8d23db66a453a37709ff643c GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*8>L*1j;i^G-t?GXUNcC zm}bdvaL3M>Mhp!N4H+33<(dpupC%gt6*HCu`2{mLJiCzw z=P@u;%n1%FC@TH_CAi?@*C$%ux?1PXoDbd*YH-o`!6TjXKAI;Pih6o?SQrNxUpDqq znDc1Tkx3y6!7D8cRaMnZH4S4syNy*huaHzQn(a7P*5`TfgMN7#z%fgoq;SEpx%hqrS)UffX2uaUR zJjBA%+3SC!CD4G2O$G^0Ypr9k`4|tvwT+hTNC@vG$;vlLc64P*X z;-ZxSz1&URIEM?H^3wAurWWu(qiIe++#ES)t&4wNf49)`brD?aXuLruH!PC{x JWt~$(69C&gj`{!q literal 0 HcmV?d00001 diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3518138721539d7677a643f54d6faa6de00ea9eb GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*P};|hAA;@^V$7mXi0(mC&=d6J>1r+0^iaggz4V=sj{k0u?N6rvEk z(!x+xRozt6Ft)SXSatIX35~Q9M`wmjnK7FyQCoY*ubmCOYz*5Qr5D*6o%sQ@IMma{ zF+^ixa)LyZg9j%Ei$IN=utNM%0nY3CE=QO+)3Ii=*@O1TaS?83{ F1OU)CYwZ94 literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index ac6d704de82..ba50aaced20 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -830,6 +830,7 @@ #include "code\game\objects\items\weapons\melee\energy.dm" #include "code\game\objects\items\weapons\melee\misc.dm" #include "code\game\objects\items\weapons\storage\backpack.dm" +#include "code\game\objects\items\weapons\storage\backpack_vr.dm" #include "code\game\objects\items\weapons\storage\bags.dm" #include "code\game\objects\items\weapons\storage\belt.dm" #include "code\game\objects\items\weapons\storage\bible.dm" From 96fff1dda284d78a37c9eb5757638029c7d35a19 Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 16:30:28 -0700 Subject: [PATCH 2/8] fixed some formatting errors --- code/game/objects/items/weapons/storage/backpack_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 1906c0f8576..8446a87482f 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -2,7 +2,7 @@ /obj/item/weapon/storage/backpack/saddlebag name = "Saddlebag" desc = "A saddle that holds items." - icon = 'icons\obj\storage_vr.dmi' + icon = 'icons/obj/storage_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "saddlebag" - icon_state = "saddlebag" \ No newline at end of file + icon_state = "saddlebag" From 0a263f7fce91009febc05319312a09eb5df1031a Mon Sep 17 00:00:00 2001 From: viv_eret Date: Sun, 24 Jul 2016 17:00:23 -0700 Subject: [PATCH 3/8] adds back_vr.dmi --- icons/mob/back_vr.dmi | Bin 0 -> 417 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/mob/back_vr.dmi diff --git a/icons/mob/back_vr.dmi b/icons/mob/back_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d3edee02d22cad4e8d23db66a453a37709ff643c GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*8>L*1j;i^G-t?GXUNcC zm}bdvaL3M>Mhp!N4H+33<(dpupC%gt6*HCu`2{mLJiCzw z=P@u;%n1%FC@TH_CAi?@*C$%ux?1PXoDbd*YH-o`!6TjXKAI;Pih6o?SQrNxUpDqq znDc1Tkx3y6!7D8cRaMnZH4S4syNy*huaHzQn(a7P*5`TfgMN7#z%fgoq;SEpx%hqrS)UffX2uaUR zJjBA%+3SC!CD4G2O$G^0Ypr9k`4|tvwT+hTNC@vG$;vlLc64P*X z;-ZxSz1&URIEM?H^3wAurWWu(qiIe++#ES)t&4wNf49)`brD?aXuLruH!PC{x JWt~$(69C&gj`{!q literal 0 HcmV?d00001 From 9147719a3a2da6861ae45e2207a9ebe3c3a1f9ab Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 17:03:25 -0700 Subject: [PATCH 4/8] changes to allow only horses to wear it --- .../items/weapons/storage/backpack_vr.dm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 8446a87482f..2e42dd3e945 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -1,8 +1,13 @@ -//Taur Bags /obj/item/weapon/storage/backpack/saddlebag - name = "Saddlebag" - desc = "A saddle that holds items." - icon = 'icons/obj/storage_vr.dmi' - icon_override = 'icons/mob/back_vr.dmi' - item_state = "saddlebag" - icon_state = "saddlebag" + name = "Saddlebag" + desc = "A saddle that holds items." + icon = 'icons\obj\storage_vr.dmi' + icon_override = 'icons/mob/back_vr.dmi' + item_state = "saddlebag" + icon_state = "saddlebag" + mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse)) + return 1 + else + H << "You need to have a horse half to wear this. + return 0 From e61846eeea7bb18dd2fcc256054f2d1f614bf5a2 Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 17:06:32 -0700 Subject: [PATCH 5/8] deletes mistakenly named file --- icons/mob/back _vr.dmi | Bin 417 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 icons/mob/back _vr.dmi diff --git a/icons/mob/back _vr.dmi b/icons/mob/back _vr.dmi deleted file mode 100644 index d3edee02d22cad4e8d23db66a453a37709ff643c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*8>L*1j;i^G-t?GXUNcC zm}bdvaL3M>Mhp!N4H+33<(dpupC%gt6*HCu`2{mLJiCzw z=P@u;%n1%FC@TH_CAi?@*C$%ux?1PXoDbd*YH-o`!6TjXKAI;Pih6o?SQrNxUpDqq znDc1Tkx3y6!7D8cRaMnZH4S4syNy*huaHzQn(a7P*5`TfgMN7#z%fgoq;SEpx%hqrS)UffX2uaUR zJjBA%+3SC!CD4G2O$G^0Ypr9k`4|tvwT+hTNC@vG$;vlLc64P*X z;-ZxSz1&URIEM?H^3wAurWWu(qiIe++#ES)t&4wNf49)`brD?aXuLruH!PC{x JWt~$(69C&gj`{!q From 56a4a3dea940797597c0963a0b008d4eff20ae16 Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 17:09:38 -0700 Subject: [PATCH 6/8] fixes formatting issue --- code/game/objects/items/weapons/storage/backpack_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 2e42dd3e945..b8f158e911e 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/backpack/saddlebag name = "Saddlebag" desc = "A saddle that holds items." - icon = 'icons\obj\storage_vr.dmi' + icon = 'icons/obj/storage_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "saddlebag" icon_state = "saddlebag" From af80b028e0929007c360e4da9bc5afcda19eb307 Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 17:28:30 -0700 Subject: [PATCH 7/8] Added a ". --- code/game/objects/items/weapons/storage/backpack_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index b8f158e911e..2293a28bdc3 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -9,5 +9,5 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse)) return 1 else - H << "You need to have a horse half to wear this. + H << "You need to have a horse half to wear this."" return 0 From 661655f362b3680db2b549ade57e09db63c619cb Mon Sep 17 00:00:00 2001 From: viv-eret Date: Sun, 24 Jul 2016 17:29:41 -0700 Subject: [PATCH 8/8] Removed a ". --- code/game/objects/items/weapons/storage/backpack_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 2293a28bdc3..76dedd32d50 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -9,5 +9,5 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse)) return 1 else - H << "You need to have a horse half to wear this."" + H << "You need to have a horse half to wear this." return 0