Merge pull request #71 from MegaDaimond/master

Lost-Paradise-Project · Sep 6, 2024 · d2d3a7e · d2d3a7e
2 parents 71bb91f + 0af905c
commit d2d3a7e
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 1 deletion.
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml
@@ -357,4 +357,9 @@
         Blunt: 0.95
         Slash: 0.95
         Piercing: 0.95
-        Heat: 0.95
+        Heat: 0.95
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+    - HidesNose
diff --git a/...res/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png b/...res/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/upgcloth.rsi/icon.png
diff --git a/...s/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png b/...s/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/base.png
diff --git a/...radise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png b/...radise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/equipped-INNERCLOTHING.png
diff --git a/...s/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png b/...s/Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/icon.png
diff --git a/.../Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png b/.../Textures/_LostParadise/Clothing/Uniforms/Summer/Bikinis/stripper.rsi/visor.png
diff --git a/...tParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png b/...tParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/base.png
diff --git a/.../Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png b/.../Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/equipped-INNERCLOTHING.png
diff --git a/...tParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png b/...tParadise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/icon.png
diff --git a/...Paradise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png b/...Paradise/Clothing/Uniforms/Summer/Swimming-trunks/swimming_trunks.rsi/visor.png