From 59fb1f2e7b7b8f175d632fa633d9d65306660800 Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Mon, 12 Dec 2016 22:42:40 +0900 Subject: [PATCH] Did some more custom PDA adjustments and fixed the g44 stuff. --- code/modules/vore/fluffstuff/custom_boxes_vr.dm | 2 +- code/modules/vore/fluffstuff/custom_guns_vr.dm | 4 ++-- code/modules/vore/fluffstuff/custom_items_vr.dm | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 54529600b5..c3bc1032ec 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -87,7 +87,7 @@ new /obj/item/weapon/gun/energy/gun/fluff/dominator(src) new /obj/item/clothing/suit/armor/det_suit(src) new /obj/item/fluff/permit/joanrisu(src) - new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/dnalockingchip(src) new /obj/item/weapon/sword/fluff/joanaria(src) new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src) new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 8668791695..724f2e8083 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -300,7 +300,7 @@ /obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands) ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m)) - icon_state = "bullpupm" + icon_state = "g44" else icon_state = (ammo_magazine)? "g44" : "g44-empty" item_state = (ammo_magazine)? "bullpup" : "bullpup-empty" @@ -308,7 +308,7 @@ //-----------------------G44 Energy Variant-------------------- -/obj/item/weapon/gun/energy/gun/burst +/obj/item/weapon/gun/energy/gun/burst/g44e name = "G44 Energy Rifle" desc = "The G44 Energy is a laser variant of the G44 lightweight assault rifle manufactured by the National Armory of Gaia. Though almost exclusively to the United Federation's Military Assault Command Operations Department (MACOs) and Starfleet, it is occassionally sold to security departments for their stun capabilities." icon = 'icons/vore/custom_guns_vr.dmi' diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 3202c59b90..3d9f5cfdfa 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -146,13 +146,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") //JoanRisu:Joan Risu -/obj/item/device/pda/heads/hos/fluff/joanpda - icon_override = 'icons/vore/custom_items_vr.dmi' +/obj/item/device/pda/heads/hos/joanpda + icon = 'icons/vore/custom_items_vr.dmi' icon_state = "pda-joan" //Vorrarkul:Lucina Dakarim -/obj/item/device/pda/heads/cmo/fluff/lucinapda - icon_override = 'icons/vore/custom_items_vr.dmi' +/obj/item/device/pda/heads/cmo/lucinapda + icon = 'icons/vore/custom_items_vr.dmi' icon_state = "pda-lucina" //john.wayne9392:Harmony Prechtl