This took way too long

SS14-Classic · Aug 2, 2024 · 3fa61be · 3fa61be
1 parent 45dc2de
commit 3fa61be
Show file tree

Hide file tree

Showing 56 changed files with 5 additions and 473 deletions.
diff --git a/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs b/Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Sound.Components;
 using Content.Shared.Mobs;
 using Content.Shared.SimpleStation14.Silicon.Systems;
+using Content.Shared.Sound.Components;
 
 namespace Content.Server.SimpleStation14.Silicon;
 
@@ -18,11 +19,7 @@ private void OnDeath(EntityUid uid, SiliconEmitSoundOnDrainedComponent component
     {
         var spamComp = EnsureComp<SpamEmitSoundComponent>(uid);
 
-        spamComp.Accumulator = 0f;
-        spamComp.RollInterval = component.Interval;
-        spamComp.PlayChance = component.PlayChance;
         spamComp.PopUp = component.PopUp;
-        spamComp.Enabled = true;
         spamComp.Sound = component.Sound;
     }
 

diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/cyberlimbs/bishop.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/cyberlimbs/bishop.yml
diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -1,12 +1,5 @@
 # Traitor single items
 
-- type: stealTargetGroup
-  id: SupermatterSliver
-  name: supermatter sliver
-  sprite:
-    sprite: Supermatter/supermatter_sliver.rsi
-    state: icon
-
 - type: stealTargetGroup
   id: Hypospray
   name: hypospray

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -4,7 +4,7 @@
   description: job-description-captain
   playTimeTracker: JobCaptain
   requirements:
-    - !type:OverallPlaytimeRequirement
+    - !type:CharacterOverallTimeRequirement
       time: 3600 # 1 Hour
   weight: 20
   startingGear: CaptainGear

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobHeadOfPersonnel
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
-    - !type:OverallPlaytimeRequirement
+    - !type:CharacterOverallTimeRequirement
       time: 3600 # 1 Hour
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -4,7 +4,7 @@
   description: job-description-hos
   playTimeTracker: JobHeadOfSecurity
   requirements:
-    - !type:OverallPlaytimeRequirement
+    - !type:CharacterOverallTimeRequirement
       time: 3600 # 1 Hour
   weight: 10
   startingGear: HoSGear

diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -4,7 +4,7 @@
   description: job-description-warden
   playTimeTracker: JobWarden
   requirements:
-    - !type:OverallPlaytimeRequirement
+    - !type:CharacterOverallTimeRequirement
       time: 3600 # 1 Hour
   startingGear: WardenGear
   icon: "JobIconWarden"

diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
@@ -2,9 +2,6 @@
   id: CPRTraining
   category: Uncategorized
   points: -2
-  components:
-    - type: LightweightDrunk
-      boozeStrengthMultiplier: 0.5
   requirements:
     - !type:CharacterJobRequirement
       inverted: true

diff --git a/...res/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi/head.png b/...res/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi/head.png
diff --git a/...ces/Textures/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi/meta.json b/...ces/Textures/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi/meta.json
diff --git a/...res/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/head.png b/...res/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/head.png
diff --git a/...aoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-primary.png b/...aoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-primary.png
diff --git a/...Pirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-secondary.png b/...Pirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-secondary.png
diff --git a/...oPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-tertiary.png b/...oPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_arm-tertiary.png
diff --git a/...s/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_foot.png b/...s/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_foot.png
diff --git a/...s/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_hand.png b/...s/EstacaoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_hand.png
diff --git a/...aoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_leg-primary.png b/...aoPirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_leg-primary.png
diff --git a/...Pirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_leg-secondary.png b/...Pirata/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/l_leg-secondary.png