Merge branch 'master' into rootytooty

DeltaV-Station · Nov 17, 2024 · a488033 · a488033
2 parents 09a22a1 + 177f4e1
commit a488033
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 53 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,30 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: Merged wizden. The upstream changelog may contain incorrect entries.
-    type: Add
-  - message: The random client freezes/crashes should be mostly gone.
-    type: Fix
-  id: 179
-  time: '2023-12-22T23:46:32.0000000+00:00'
-- author: ps3moira
-  changes:
-  - message: Reverted in-hand E-Sword sprites.
-    type: Tweak
-  id: 180
-  time: '2023-12-24T02:56:01.0000000+00:00'
-- author: deltanedas
-  changes:
-  - message: Ore Bags of Holding now use bluespace crystals instead of uranium.
-    type: Tweak
-  id: 181
-  time: '2023-12-24T19:58:23.0000000+00:00'
-- author: Adrian16199
-  changes:
-  - message: Fixes cyborgs spawning with nearsighted trait.
-    type: Fix
-  id: 182
-  time: '2023-12-27T17:55:07.0000000+00:00'
 - author: Adrian16199
   changes:
   - message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.'
@@ -3735,3 +3709,31 @@
   id: 678
   time: '2024-11-17T00:48:14.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2215
+- author: Radezolid
+  changes:
+  - message: Beanbags hits hard again, bartenders rejoice!
+    type: Tweak
+  id: 679
+  time: '2024-11-17T04:45:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2219
+- author: Stop-Signs
+  changes:
+  - message: Heads of Security will now have an energy shotgun in their locker.
+    type: Add
+  id: 680
+  time: '2024-11-17T13:10:01.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2182
+- author: Radezolid
+  changes:
+  - message: Removed the Chief Justice cloak from the uniform printer.
+    type: Remove
+  id: 681
+  time: '2024-11-17T13:24:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2180
+- author: Beck Thompson
+  changes:
+  - message: Generic radio implants are no longer syndicate branded.
+    type: Tweak
+  id: 682
+  time: '2024-11-17T19:06:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2159
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
@@ -11,9 +11,6 @@ uplink-syndicate-radio-implanter-desc = A cranial implant that lets you talk on
 uplink-syndicate-radio-implanter-bundle-name = Syndicate Radio Implanter Bundle
 uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of one and a half! Share one with your Syndicate friend.
 
-uplink-generic-radio-implanter-name = Generic Radio Implanter
-uplink-generic-radio-implanter-desc = A cranial implant with a bluespace compartment for a single encryption key (not included). Put in a key of your choice, and you can talk using it like you would with any headset.
-
 uplink-doorjack-name = Airlock Access Override
 uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else.
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -327,7 +327,7 @@
     - !type:NestedSelector # DeltaV
       tableId: LockerFillHeadOfSecurityDeltaV
     - id: BookSecretDocuments
-    #- id: WeaponEnergyShotgun # DeltaV - replaced by X-01
+    - id: WeaponEnergyShotgun
     - id: BookSpaceLaw
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
@@ -7,3 +7,13 @@
   cost: 500
   category: Medical
   group: market
+
+- type: cargoProduct
+  id: RadioImplantCrate
+  icon:
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
+  product: CrateGenericRadioImplants
+  cost: 1500
+  category: Medical
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: CrateGenericRadioImplants
+  parent: CrateMedical
+  name: radio implant crate
+  description: Communicate without having a pesky headset on your ear.
+  components:
+  - type: StorageFill
+    contents:
+    - id: GenericRadioImplanter
+      amount: 3
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -75,21 +75,6 @@
   categories:
   - UplinkImplants
 
-
-- type: listing
-  id: UplinkGenericRadioImplanter
-  name: uplink-generic-radio-implanter-name
-  description: uplink-generic-radio-implanter-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: crypt_rusted }
-  productEntity: GenericRadioImplanter
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 1
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkImplants
-
 - type: listing
   id: UplinkDoorjack
   name: uplink-doorjack-name

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
@@ -7,7 +7,7 @@
     implant: BionicSyrinxImplant
 
 - type: entity
-  parent: BaseImplantOnlyImplanterSyndi
+  parent: BaseImplantOnlyImplanter
   id: GenericRadioImplanter
   suffix: generic radio
   components:

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
@@ -21,7 +21,7 @@
   parent: StorageImplant
   id: RadioImplant
   name: generic radio implant
-  description: This implant contains a radio augmentation with a bluespace compartment for an encryption key. It allows its user to communicate on the key's channels.
+  description: This implant contains a radio augmentation with a hidden compartment for an encryption key. It allows its user to communicate on the key's channels.
   components:
   - type: SubdermalImplant
     implantAction: ActionOpenRadioImplant

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -26,7 +26,7 @@
       types:
         Blunt: 10
   - type: StaminaDamageOnCollide
-    damage: 40 # 3 hits to stun
+    damage: 55 # DeltaV - Modified the beanbag stamina damage, was 40.
 
 - type: entity
   id: PelletShotgun

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1030,15 +1030,16 @@
           bounds: "-0.15,-0.3,0.15,0.3"
         hard: false
         mask:
-        - Impassable
-        - BulletImpassable
+       # - Impassable 
+       # - BulletImpassable
+        - Opaque # Delta-V changed from impassable so that they can go through windows
       fly-by: *flybyfixture
   - type: Ammo
   - type: Projectile
     impactEffect: BulletImpactEffectOrangeDisabler
     damage:
       types:
-        Heat: 13
+        Heat: 10 # DeltaV changed from 13 to 10
 
 - type: entity
   name: wide laser barrage

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1233,7 +1233,6 @@
       - ClothingOuterWinterQM
       - ClothingOuterWinterRD
       - ClothingOuterChiefJustice # DeltaV - Chief Justice
-      - ClothingNeckCloakCJ # DeltaV - Chief Justice
       - ClothingOuterStasecSweater # DeltaV - added stasec sweater to uniform printer.
       - ClothingOuterWinterMusician
       - ClothingOuterWinterClown