From e7ddc06368c72d2ea9752680e00341b4a13cd4bf Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Fri, 3 Jun 2016 20:21:12 -0700 Subject: [PATCH] Rebuilt the Crescent Rose code and edited the custom swords because they were inheriting the wrong stats. --- .../modules/vore/fluffstuff/custom_guns_vr.dm | 27 ++++++++++++++---- .../vore/fluffstuff/custom_items_vr.dm | 4 +-- icons/vore/custom_guns_vr.dmi | Bin 21873 -> 21878 bytes 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 1785fc2eddb..a5593840637 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -210,8 +210,7 @@ toggle_scope(2.0) -//This weapon is shelved until someone can fix the modifystate var and apply a safety to the scythe mode. - +//Currently, the only problem I have now is that this weapon's item_state isn't working. /obj/item/weapon/gun/projectile/automatic/fluff/crestrose name = "Crescent Rose" desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward." @@ -219,18 +218,22 @@ icon_state = "crestrose_fold" icon_override = 'icons/vore/custom_guns_vr.dmi' - item_state = "crestrose_fold" + item_state = "crestrose_fold_mob" w_class = 4 caliber = "75" origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4) - slot_flags = SLOT_BACK + slot_flags = null ammo_type = "/obj/item/ammo_casing/a75" fire_sound = 'sound/weapons/Gunshot_light.ogg' load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/a75 force = 3 var/on = 0 + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' + hitsound = null + /obj/item/weapon/gun/projectile/automatic/fluff/crestrose/attack_self(mob/user as mob) on = !on @@ -241,10 +244,11 @@ icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "crestrose" icon_override = 'icons/vore/custom_guns_vr.dmi' - item_state = "crestrose" + item_state = "crestrose_mob" w_class = 4 force = 15//Obscenely robust attack_verb = list("slashed", "cut", "drives") + hitsound = 'sound/weapons/bladeslice.ogg' else user.visible_message("\The [user] folds the weapon back up into a gun.",\ "You fold up the weapon.",\ @@ -252,10 +256,21 @@ icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "crestrose_fold" icon_override = 'icons/vore/custom_guns_vr.dmi' - item_state = "crestrose_fold" + item_state = "crestrose_fold_mob" w_class = 3 force = 3//Not so obscenely robust attack_verb = list("hit", "melee'd") + hitsound = null + + +/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") + + if(default_parry_check(user, attacker, damage_source) && prob(50)) + user.visible_message("\The [user] parries [attack_text] with \the [src]!") + playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + return 1 + return 0 + // molenar:Kari Akiren diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index ac92e4d702f..ecd460d9b35 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -74,7 +74,7 @@ icon_state = "joanzip" //JoanRisu:Joan Risu -/obj/item/weapon/claymore/fluff/joanaria +/obj/item/weapon/material/sword/fluff/joanaria name = "Aria" desc = "A beautifully crafted rapier owned by Joan Risu. It has a thin blade and is used for quick attacks." icon = 'icons/vore/custom_items_vr.dmi' @@ -82,7 +82,7 @@ origin_tech = "materials=7" //For General use -/obj/item/weapon/claymore/fluff/scisword +/obj/item/weapon/material/sword/fluff/scisword name = "Sci Blade" desc = "A sword that can not only cut down your enemies, it can also cut fabric really neatly" icon = 'icons/vore/custom_items_vr.dmi' diff --git a/icons/vore/custom_guns_vr.dmi b/icons/vore/custom_guns_vr.dmi index 1e7fa7b4143e1d8b79065c60bf75a3f91f3f4738..aefbf915a698d6bd6e3b3ef21293420d9447047b 100644 GIT binary patch delta 475 zcmV<10VMwMssZ+@0gxnr=6Y0EbVOxyV{&P5bZKvH004NLt(Hx0<1h?`*Y+udc54(? ze$bUSg9L*t+D#7-sIg*kq(}o=j*y;y7S7a28`osoT>^ZMk9ssH-HTuA-YsG`1J%d;A=6_t>Awnuf) z{qJ|S>HO9W)Z#kjRI8D|HJ#rgvD!3OhXZ&O1GcgA<>XN=@Y#~bFPZfpne}DKFtFg< zs9=$2wRY+xDj^G5$YQL*Sc~KWW0{Z(j17TY;JcFn0V#hxbEXMTah^HTgQqypoaw<+ z^fTw~dV;`$H#7O=ro2iM7WV)XZiN9J+jg^ITg{94HRXuQ^3$3tWS*f;;OlEmG#C;+ zj0Qs@htXh29#N$4C#l$pkBHIO%8+jUKrrp!uaCV!w$nBc*}^xAb3j;#2|P} zkHjE&dt+)S2Ep5J#}ZYmT#fn|+)?9X-#Zs}HU+c@dpG^4zQhR^*ayM%_Dis{x_<3q z)VO!2$&T=({5FAqnt&qmzAb^%#CH*3T=kdfMdw R0QTGJf?)XCFS8B;V^j7r?QZ}8 delta 496 zcmVB_2jlYS;eiTpZUz?p+Z8!N@ zV++BHN-Tbqd6uA#MpR-x%QK^)F|q&CMisTF#KZdZ5-;L8s;D1c@~j4IMI~gO9Z{Wh z|ND(?I=^=VwYW_=)oLVgP3QMWtTxTn;RIgAfNku2IeC^k2+b_Yv>iTyV zqsF7VOm>79<@X8v-%0XMhtuT_sN0C4rL;P*gdAR3MhC~>>M{ILtamH1+HUfHCW_}s mcs)oq001BWNkl