cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix two fluff IDs

Browse Source 
Path changed and this ID split into two in the backend.
This commit is contained in:
Arokha Sieyes
2017-12-26 18:16:29 -05:00
parent 6ed496e810
commit 08ea0ccfd5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+2 -2
View File
@@ -91,7 +91,7 @@
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src)
new /obj/item/clothing/head/caphat/formal/fedcover(src)
new /obj/item/weapon/card/id/centcom/fluff/joanbadge(src)
new /obj/item/weapon/card/id/centcom/station/fluff/joanbadge(src)
new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/clothing/accessory/permit/gun/fluff/joanrisu(src)
@@ -172,7 +172,7 @@
New()
..() //Might look like a lot... but all small items.
//Centcom stuff and permit
new /obj/item/weapon/card/id/centcom/fluff/aronai(src)
new /obj/item/weapon/card/id/centcom/station/fluff/aronai(src)
new /obj/item/clothing/accessory/permit/gun/fluff/aronai_kadigan(src)
//Gun and holster
new /obj/item/weapon/gun/projectile/nsfw(src)
code/modules/vore/fluffstuff/custom_items_vr.dm
+5 -5
View File
@@ -128,7 +128,7 @@
attack_verb = list("attacked", "hammered", "smashed", "slammed", "crushed")
//JoanRisu:Joan Risu
/obj/item/weapon/card/id/centcom/fluff/joanbadge
/obj/item/weapon/card/id/centcom/station/fluff/joanbadge
name = "Faded Badge"
desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front."
icon = 'icons/vore/custom_items_vr.dmi'
@@ -137,11 +137,11 @@
assignment = "Centcom Officer"
/obj/item/weapon/card/id/centcom/fluff/joanbadge/attack_self(mob/user as mob)
/obj/item/weapon/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob)
if(isliving(user))
user.visible_message("<span class='warning'>[user] flashes their golden security badge.\nIt reads:NT Security.</span>","<span class='warning'>You display the faded badge.\nIt reads: NT Security.</span>")
/obj/item/weapon/card/id/centcom/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user)
/obj/item/weapon/card/id/centcom/station/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
@@ -316,12 +316,12 @@
return
//arokha:Aronai Kadigan - Centcom ID (Medical dept)
/obj/item/weapon/card/id/centcom/fluff/aronai
/obj/item/weapon/card/id/centcom/station/fluff/aronai
registered_name = "CONFIGURE ME"
assignment = "CC Medical"
var/configured = 0
/obj/item/weapon/card/id/centcom/fluff/aronai/attack_self(mob/user as mob)
/obj/item/weapon/card/id/centcom/station/fluff/aronai/attack_self(mob/user as mob)
if(configured)
return ..()