cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #395 from JoanRisu/Fluff_Items_worshop

Browse Source 
More banners for related universe events
This commit is contained in:
Spades
2016-07-03 18:54:49 -04:00
committed by GitHub
parent bb8c14c69c fe3c54d7c5
commit 27e6a36836
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/vore/fluffstuff/custom_boxes_vr.dm
View File

@@ -67,6 +67,7 @@
/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
name = "Joan's Workbag"
desc = "A duffle bag Joan uses to carry her work equipment."
slowdown = 0
New()
..()
@@ -85,6 +86,7 @@
/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/Katarina
name = "Katarina's Workbag"
desc = "A duffle bag Katarina uses to carry her tools."
slowdown = 0
New()
..()

27
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -79,6 +79,8 @@
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'
icon_state = "joanaria"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "joanariamob"
origin_tech = "materials=7"
force = 15
sharp = 1
@@ -201,7 +203,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
icon_state = "Flag_Nanotrasen"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "Flag_Nanotrasen"
item_state = "Flag_Nanotrasen_mob"
attack_self(mob/user as mob)
if(isliving(user))
@@ -220,7 +222,28 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
icon_state = "flag_federation"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "flag_federation"
item_state = "flag_federation_mob"
xcom
name = "Alien Combat Command Banner"
desc = "A banner bearing the symbol of a task force fighting an unknown alien power."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "flag_xcom"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "flag_xcom_mob"
advent
name = "ALIEN Coalition Banner"
desc = "A banner belonging to traitors who work for an unknown alien power."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "flag_advent"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "flag_advent_mob"
//zodiacshadow: ?
/obj/item/device/radio/headset/fluff/zodiacshadow