cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Keila-coon
2019-11-29 13:07:46 -04:00
committed by GitHub
parent bd20725406 ab6a36db6d
commit 698d5d564d
378 changed files with 207755 additions and 161420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+1 -3
View File
@@ -60,9 +60,7 @@
desc = "A kit containing Tasald's equipment."
has_items = list(
/obj/item/clothing/suit/storage/det_suit/fluff/tasald,
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat,
/obj/item/clothing/under/det/fluff/tasald,
/obj/item/weapon/implanter/loyalty)
/obj/item/clothing/under/det/fluff/tasald)
//bwoincognito:Octavious Ward
/obj/item/weapon/storage/box/fluff/octavious
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+16 -16
View File
@@ -502,22 +502,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
// bwoincognito:Tasald Corlethian
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat
name = "Armored Colony coat"
desc = "Dark green and grey colored sleeveless long coat with two thick metal shoulder pads. has seen some wear and tear, with noticeable patches in the fabric, scratches on the shoulder pads, but with a clean patch on the left upper chest. It has a red NT marked on the right shoulder pad and red Security on the left. "
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet)
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "tasaldcoat"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "tasaldcoat_mob"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
//Event Costumes Below
/obj/item/clothing/head/helmet/fluff/freddy
name = "Animatronic Suit Helmet"
@@ -1917,3 +1901,19 @@ Departamental Swimsuits, for general use
/obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null)
return FALSE //Indigestible
//Bacon12366:Elly Brown
/obj/item/clothing/accessory/sweater/fluff/star
name = "Star Sweater"
desc = "It's a white long sweater with a big yellow star at the chest. It seems like it's made of a soft material."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "star_sweater"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "star_sweater"
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
w_class = ITEMSIZE_NORMAL
slot = ACCESSORY_SLOT_OVER
code/modules/vore/fluffstuff/custom_clothes_yw.dm
+1 -1
View File
@@ -1478,7 +1478,7 @@
// ******
// CheekyCrenando
// ******
//Srusu Rskuzu
//Srusu Rskuzu-Ahslru
/obj/item/clothing/under/fluff/srususoviet
name = "Soviet Uniform"
desc = "A standard issue Soviet Dress uniform"
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -1
View File
@@ -249,7 +249,7 @@
name = "Mouse Plushie"
desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
slot_flags = SLOT_HEAD
icon_state = "mouse_brown"
icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C
item_state = "mouse_brown_head"
icon = 'icons/vore/custom_items_vr.dmi'
icon_override = 'icons/vore/custom_items_vr.dmi'