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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-07 18:46:44 -04:00
committed by GitHub
parent c5d1d96bc9
commit ad8de5493b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -2469,16 +2469,13 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "foxflightsuit_mob" item_state = "foxflightsuit_mob"
<<<<<<< HEAD
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
End CHOMP Removal*/
=======
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
//Shalax: Cerise Duelliste //Shalax: Cerise Duelliste
/obj/item/weapon/storage/belt/security/fluff/cerise /obj/item/weapon/storage/belt/security/fluff/cerise
name = "champion's belt" name = "champion's belt"
desc = "Cerise's hard-won belt from her glory days. Her skill might have waned since then, but her renown lives on." desc = "Cerise's hard-won belt from her glory days. Her skill might have waned since then, but her renown lives on."
icon_state = "champion" icon_state = "champion"
item_state = null // i swear to god this works - hatterhat item_state = null // i swear to god this works - hatterhat
>>>>>>> 20da18f481... Merge pull request #13452 from Hatterhat/shalax-belt
End CHOMP Removal*/