mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 13:09:11 +01:00
Rebuilt the Crescent Rose code and edited the custom swords because they were inheriting the wrong stats.
This commit is contained in:
@@ -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("<span class='notice'>\The [user] folds the weapon back up into a gun.</span>",\
|
||||
"<span class='notice'>You fold up the weapon.</span>",\
|
||||
@@ -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("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
|
||||
playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
// molenar:Kari Akiren
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user