cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hypo

Browse Source
This commit is contained in:
Cyantime
2018-01-20 01:39:16 -05:00
committed by GitHub
parent 09eb4054a5 94b61b4e52
commit 84c3154b2b
101 changed files with 2436 additions and 16397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+4 -4
View File
@@ -116,10 +116,10 @@
new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/clothing/accessory/storage/black_vest(src)
new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
//drakefrostpaw:Drake Frostpaw
code/modules/vore/fluffstuff/custom_items_vr.dm
+2 -2
View File
@@ -97,11 +97,11 @@
return 0
//joanrisu:Katarina Eine
/obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina
/obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina
name = "tactical Knife"
desc = "A tactical knife with a small butterly engraved on the blade."
/obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
/obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina/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(75))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")