cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-06-17 04:30:06 +02:00
parent 12f84343ab dae1d92832
commit 4864ad384d
116 changed files with 10186 additions and 4123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/belly_obj_vr.dm
+2 -2
View File
@@ -20,8 +20,8 @@
var/nonhuman_prey_swallow_time = 30 // Time in deciseconds to swallow anything else
var/emote_time = 60 SECONDS // How long between stomach emotes at prey
var/nutrition_percent = 100 // Nutritional percentage per tick in digestion mode
var/digest_brute = 2 // Brute damage per tick in digestion mode
var/digest_burn = 2 // Burn damage per tick in digestion mode
var/digest_brute = 0.5 // Brute damage per tick in digestion mode
var/digest_burn = 0.5 // Burn damage per tick in digestion mode
var/immutable = FALSE // Prevents this belly from being deleted
var/escapable = FALSE // Belly can be resisted out of at any time
var/escapetime = 60 SECONDS // Deciseconds, how long to escape this belly
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+25
View File
@@ -1965,3 +1965,28 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_onmob_vr.dmi'
icon_state = "azuracollar"
//Xonkon: Zena Aviv
/obj/item/clothing/head/helmet/space/void/engineering/zena
name = "custom shroud helmet"
desc = "A black and orange engineering shroud helmet. Orange plated and specially crafted and augmented for a variety of activites."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "zenahelmet"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "zenahelmet_mob"
species_restricted = null
/obj/item/clothing/suit/space/void/engineering/zena
name = "custom shroud suit"
desc = "A black and orange engineering shroud helmet. Skintight and specially crafted and augmented for a variety of activites."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "zenasuit"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "zenasuit_mob"
species_restricted = null