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

Merge branch 'master' into weapon-removal

Browse Source
This commit is contained in:
Guti
2024-09-18 18:07:43 +02:00
parent 409aaba802 55ac1c54f0
commit f4f5476121
482 changed files with 5086 additions and 35138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+3 -3
View File
@@ -697,7 +697,7 @@
//HOS Hardsuit
/obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig version.
name = "\improper prototype voidsuit"
desc = "A customized security voidsuit made to match the Head of Security's obession with black. Has additional composite armor."
desc = "A customized security voidsuit made to match the " + JOB_HEAD_OF_SECURITY + "'s obession with black. Has additional composite armor."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "rig-hos"
@@ -710,7 +710,7 @@
//HOS Hardsuit Helmet
/obj/item/clothing/head/helmet/space/void/security/fluff/hos // ToDo: Rig version.
name = "\improper prototype voidsuit helmet"
desc = "A customized security voidsuit helmet customized to include the Head of Security's signature hat. Has additional composite armor."
desc = "A customized security voidsuit helmet customized to include the " + JOB_HEAD_OF_SECURITY + "'s signature hat. Has additional composite armor."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "rig0-hos"
@@ -1145,7 +1145,7 @@
//KiwiDaNinja: Chakat Taiga
/obj/item/clothing/under/fluff/taiga
name = "Taiga's F.D Uniform"
desc = "This uniform - consisting of only the uniform shirt, and built out of a soft fleece - dons the badge of Amistad Fire and Rescuse on both shoulders. The badges denote the wearer as a FF/Paramedic, and their name is embroidered in a gold thread on their right breast; Chakat Taiga! An 'official' badge is pinned to their left breast." //A walking advertisement?
desc = "This uniform - consisting of only the uniform shirt, and built out of a soft fleece - dons the badge of Amistad Fire and Rescuse on both shoulders. The badges denote the wearer as a FF/" + JOB_PARAMEDIC + ", and their name is embroidered in a gold thread on their right breast; Chakat Taiga! An 'official' badge is pinned to their left breast." //A walking advertisement?
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "taigaff_on"
code/modules/vore/fluffstuff/custom_items_vr.dm
+2 -2
View File
@@ -1475,8 +1475,8 @@
//PastelPrinceDan - Kiyoshi/Masumi Maki
/obj/item/toy/plushie/fluff/slimeowshi
name = "Slime-Cat Research Director plushie"
desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a Research Director's insignia."
name = "Slime-Cat " + JOB_RESEARCH_DIRECTOR + " plushie"
desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a " + JOB_RESEARCH_DIRECTOR + "'s insignia."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "kimeowshi"
attack_verb = list("blorbled", "slimed", "absorbed", "glomped")