Merge branch 'master' into Shuttle-Fix

Content.Server/Chat/Managers/ChatManager.RateLimit.cs

@@ -28,7 +28,7 @@ private void RateLimitPlayerLimited(ICommonSession player)
 
     private void RateLimitAlertAdmins(ICommonSession player)
     {
-        SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name)));
+        // SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name))); // DeltaV - I DON'T CARE
     }
 
     public RateLimitStatus HandleRateLimit(ICommonSession player)

Content.Shared/CCVar/CCVars.cs

@@ -2120,7 +2120,7 @@ public static readonly CVarDef<string>
         /// The time you must spend reading the rules, before the "Request" button is enabled
         /// </summary>
         public static readonly CVarDef<float> GhostRoleTime =
-            CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED | CVar.SERVER);
+            CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER);
 
         /// <summary>
         /// If ghost role lotteries should be made near-instanteous.

Resources/Audio/_RMC14/Voice/Xeno/attributions.yml

@@ -0,0 +1,14 @@
+- files: ["alien_talk1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk.ogg"
+
+- files: ["alien_talk2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk2.ogg"
+
+- files: ["alien_talk3.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk3.ogg"

Resources/Changelog/DeltaVChangelog.yml

@@ -1,41 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: The 10 reserved whitelist slots have been removed until further notice.
-    type: Tweak
-  id: 111
-  time: '2023-10-29T03:10:27.0000000+00:00'
-- author: Colin-Tel
-  changes:
-  - message: Altered the rules. Read the latest changes to them at the top of the
-      rules list!
-    type: Tweak
-  id: 112
-  time: '2023-10-29T17:36:46.0000000+00:00'
-- author: VMSolidus
-  changes:
-  - message: Cargo can now order medical scrub crates
-    type: Add
-  id: 113
-  time: '2023-10-29T17:38:19.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-  - message: Removed the clown hardsuit from being craftable.
-    type: Remove
-  id: 114
-  time: '2023-10-30T13:17:07.0000000+00:00'
-- author: Colin-Tel
-  changes:
-  - message: Asterisk station has been added to the game.
-    type: Add
-  id: 115
-  time: '2023-11-01T16:32:48.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-  - message: Switched logos around
-    type: Tweak
-  id: 116
-  time: '2023-11-01T22:45:55.0000000+00:00'
 - author: TJohnson
   changes:
   - message: Security has received new models of hardsuit!
@@ -3675,3 +3638,45 @@
   id: 610
   time: '2024-10-14T23:43:17.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1980
+- author: Radezolid
+  changes:
+  - message: The tracking implants crate is now more expensive.
+    type: Tweak
+  id: 611
+  time: '2024-10-15T23:01:23.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2011
+- author: Unkn0wnGh0st333
+  changes:
+  - message: Chemistry and Hydroponics doors have been readded
+    type: Tweak
+  id: 612
+  time: '2024-10-18T00:31:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1995
+- author: BlitzTheSquishy
+  changes:
+  - message: Readded the Sec Sticker!
+    type: Add
+  id: 613
+  time: '2024-10-20T00:01:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2022
+- author: ThataKat
+  changes:
+  - message: Small doses of theobromine no longer cause vomiting in animal species.
+    type: Tweak
+  id: 614
+  time: '2024-10-20T05:22:44.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2024
+- author: deltanedas
+  changes:
+  - message: Ghost role waiting time is down to 3 seconds, from 8.
+    type: Tweak
+  id: 615
+  time: '2024-10-20T16:02:51.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2026
+- author: deltanedas
+  changes:
+  - message: Removed salt ore in favour of coal. Give the chemists carbon!
+    type: Remove
+  id: 616
+  time: '2024-10-20T17:30:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2027

Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl

@@ -67,7 +67,6 @@ loadout-group-scarfs = Scarf
 # Epistemics
 loadout-group-mantis-head = Mantis head
 loadout-group-mantis-jumpsuit = Mantis jumpsuit
-loadout-group-mantis-backpack = Mantis backpack
 loadout-group-mantis-outerclothing = Mantis outer clothing
 loadout-group-mantis-shoes = Mantis shoes
 loadout-group-mantis-gloves = Mantis gloves

Resources/Maps/Shuttles/DeltaV/helix.yml

@@ -366,7 +366,6 @@ entities:
     - type: RadiationGridResistance
     - type: SpreaderGrid
     - type: GravityShake
-      nextShake: 0
       shakeTimes: 10
 - proto: AirCanister
   entities:
@@ -499,14 +498,14 @@ entities:
   - uid: 205
     components:
     - type: MetaData
-      name: Treatment APC
+      name: Treatment / West docks APC
     - type: Transform
       pos: -3.5,7.5
       parent: 1
   - uid: 448
     components:
     - type: MetaData
-      name: Cryo APC
+      name: Cryo / East docks APC
     - type: Transform
       pos: 10.5,8.5
       parent: 1
@@ -559,7 +558,7 @@ entities:
   - uid: 28
     components:
     - type: Transform
-      pos: 10.5,7.5
+      pos: -3.5,5.5
       parent: 1
   - uid: 29
     components:
@@ -951,6 +950,31 @@ entities:
     - type: Transform
       pos: 2.5,3.5
       parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
 - proto: CableHV
   entities:
   - uid: 107
@@ -1223,13 +1247,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,11.5
       parent: 1
-- proto: chem_master
-  entities:
-  - uid: 140
-    components:
-    - type: Transform
-      pos: 4.5,3.5
-      parent: 1
 - proto: ChemDispenser
   entities:
   - uid: 141
@@ -1244,6 +1261,13 @@ entities:
     - type: Transform
       pos: 3.5,1.5
       parent: 1
+- proto: ChemMaster
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
 - proto: ClosetWallEmergencyFilledRandom
   entities:
   - uid: 445

Resources/Prototypes/Catalog/Cargo/cargo_armory.yml

@@ -24,7 +24,7 @@
     sprite: Objects/Specific/Medical/implanter.rsi
     state: implanter0
   product: CrateTrackingImplants
-  cost: 1000
+  cost: 4000 # DeltaV - was 1000
   category: cargoproduct-category-name-armory
   group: market
 

Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -0,0 +1,19 @@
+
+#Chemistry
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyChemistry
+  suffix: Chemistry
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi #Delta V - Resprite Doors
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyChemistryGlass
+  suffix: Chemistry, Glass
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi #Delta V - Resprite Doors
+    state: "assembly"

Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml

@@ -6,11 +6,11 @@
     atmospherics: DeltaV/Structures/Doors/Airlocks/Standard/atmospherics.rsi
     basic:       DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi
     cargo:       DeltaV/Structures/Doors/Airlocks/Standard/cargo.rsi
-    chemistry:   DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # TODO: resprite chemistry
+    chemistry:   DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi 
     command:     DeltaV/Structures/Doors/Airlocks/Standard/command.rsi
     engineering: DeltaV/Structures/Doors/Airlocks/Standard/engineering.rsi
     freezer:     DeltaV/Structures/Doors/Airlocks/Standard/freezer.rsi
-    hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # TODO: resprite hydroponics
+    hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi 
     maintenance: DeltaV/Structures/Doors/Airlocks/Standard/maint.rsi
     science:     DeltaV/Structures/Doors/Airlocks/Standard/science.rsi
     security:    DeltaV/Structures/Doors/Airlocks/Standard/security.rsi
@@ -23,16 +23,16 @@
   stylePaths:
     atmospherics: DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi
     basic:       DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi
-    chemistry:   DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # TODO: resprite chemistry
+    chemistry:   DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi 
     command:     DeltaV/Structures/Doors/Airlocks/Glass/command.rsi
     science:     DeltaV/Structures/Doors/Airlocks/Glass/science.rsi
     cargo:       DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi
     engineering: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi
     glass:       DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi
-    hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi
+    hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi
     maintenance: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi
     medical:     DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi
     security:    DeltaV/Structures/Doors/Airlocks/Glass/security.rsi
     virology:    DeltaV/Structures/Doors/Airlocks/Glass/virology.rsi
     justice:     DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Add Justice Dept
-    # TODO: hydroponics sprite
+

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -119,6 +119,7 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
+    speechSounds: Xenonid # DeltaV: Use RMC's speech sounds for sentient xenos
   - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
     chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -46,7 +46,7 @@
   suffix: Hydroponics
   components:
   - type: Sprite
-    sprite: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi # DeltaV - Resprite Doors
   - type: Wires
     layoutId: AirlockService
 
@@ -76,7 +76,7 @@
   suffix: Chemistry
   components:
   - type: Sprite
-    sprite: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi # DeltaV - Reprite Doors
 
 - type: entity
   parent: Airlock
@@ -210,10 +210,10 @@
 - type: entity
   parent: AirlockGlass
   id: AirlockHydroponicsGlass
-  suffix: Hydroponics, DO NOT MAP # DeltaV: DNM as its not resprited yet
+  suffix: Hydroponics 
   components:
   - type: Sprite
-    sprite: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi # DeltaV - Resprite Doors
   - type: Wires
     layoutId: AirlockService
 
@@ -235,7 +235,8 @@
   suffix: Chemistry
   components:
   - type: Sprite
-    sprite: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi # DeltaV - Resprite Doors
+
 
 - type: entity
   parent: AirlockMedicalGlass

Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -145,7 +145,7 @@
   suffix: Hydroponics
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Delta V - Resprite Doors
     state: "assembly"
 
 - type: entity
@@ -154,7 +154,7 @@
   suffix: Hydroponics, Glass
   components:
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Delta V - Resprite Doors
     state: "assembly"
 
 #Maintenance

Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

@@ -456,7 +456,7 @@
   parent: CratePirate
   id: CrateToyBox
   name: toy box
-  suffix: Empty
+  #suffix: Empty # Delta V - Commented out simply for clarity at spawn menu on other uses besides the filled toy box.
   description: A box overflowing with fun.
   components:
   - type: Sprite

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1288,12 +1288,12 @@
   - EmergencyOxygenSecurity
   - LoadoutSpeciesVoxNitrogen
 
-#- type: loadoutGroup # DeltaV - removed for incongruence
-#  id: SecurityStar
-#  name: loadout-group-security-star
-#  minLimit: 0
-#  loadouts:
-#  - SecStar
+- type: loadoutGroup
+  id: SecurityStar
+  name: loadout-group-security-star
+  minLimit: 0
+  loadouts:
+  - SecStar
 
 # Medical
 - type: loadoutGroup