Revert "New years cap (SerbiaStrong-220#2439)" (SerbiaStrong-220#2554)

* Revert "New years cap (SerbiaStrong-220#2439)" This reverts commit c9f2182. * Reapply "New years cap (SerbiaStrong-220#2439)" This reverts commit 17d5d1f. * Oops, all comments
Kirus59 · Feb 13, 2025 · 3d89fe0 · 3d89fe0
1 parent f9dad45
commit 3d89fe0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -32,7 +32,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2500 #SS220 New years cap Begin \ Вернуть после нового года \ 2440
+  cost: 2440 #2500 #SS220 New years cap Begin \ Вернуть после нового года
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -78,7 +78,7 @@
     ClothingHeadHatCorpsoft: 2
     ClothingHeadFishCap: 2
     ClothingHeadRastaHat: 2
-    ClothingHeadHatNewYearsCap: 5 #SS220 New years cap \ Убрать после нового года
+    #ClothingHeadHatNewYearsCap: 5 #SS220 New years cap \ Убрать после нового года
     ClothingBeltStorageWaistbag: 3
     ClothingEyesGlasses: 6
     ClothingHandsGlovesColorBlack: 4

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -19,7 +19,7 @@
     ClothingOuterPoncho: 2
     ClothingHeadHatSantahat: 2
     ClothingOuterSanta: 2
-    ClothingHeadHatNewYearsCap: 2 #SS220 New years cap
+    #ClothingHeadHatNewYearsCap: 2 #SS220 New years cap
     ClothingHeadHatSkub: 2
     ClothingOuterSkub: 2
     ClothingHeadHatBeretFrench: 2

diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -40,17 +40,17 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
-#    sprite: Mobs/Ghosts/ghost_human.rsi ## ss220-new-years-cap
-#    color: "#fff8" ss220-new-years-cap
+    sprite: Mobs/Ghosts/ghost_human.rsi
+    color: "#fff8"
     layers:
     - state: animated
       shader: unshaded
     ## ss220-new-years-cap begin
-      sprite: Mobs/Ghosts/ghost_human.rsi
-      color: "#fff8"
-    - state: cap-ghost
-      shader: unshaded
-      sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
+    #   sprite: Mobs/Ghosts/ghost_human.rsi
+    #   color: "#fff8"
+    # - state: cap-ghost
+    #   shader: unshaded
+    #   sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
     ## ss220-new-years-cap end
   - type: ContentEye
     maxZoom: 1.44,1.44

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -380,8 +380,8 @@
     access: []
   #ss220 wires cut fix end
 #SS220 New years cap Begin \ Убрать после нового года
-  - type: StaticPrice
-    price: 3000
+  # - type: StaticPrice
+  #   price: 3000
 #SS220 New years cap End \ Убрать после нового года
 
 - type: entity