Id[entity] 2.0 (real) (#9612)

* starter API * network ID cards * Port more stuff from old identity * Re-implement identity representation + name updating * move * proper name returning for `IdentityName` * move everything important to server, give in to temptation * shared / server / client split sadly. move ensure to shared and spawn to server * identity update queueing + identityblocker * fixes * and just like that it's usable for admins * huge identity pass * pass dos * jesus christ * figs :D * fuck u * fix bad merge. Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 18:36:53 -07:00
parent fb6586cdc6
commit 2d5ec7f85c
68 changed files with 668 additions and 188 deletions
--- a/Resources/Locale/en-US/actions/actions/blocking.ftl
+++ b/Resources/Locale/en-US/actions/actions/blocking.ftl
@@ -4,7 +4,7 @@ action-description-blocking = Raise or lower your shield.
 action-popup-blocking-user = You raise your {$shield}!
 action-popup-blocking-disabling-user = You lower your {$shield}!

-action-popup-blocking-other = {$blockerName} raises their {$shield}!
-action-popup-blocking-disabling-other = {$blockerName} lowers their {$shield}!
+action-popup-blocking-other = {CAPITALIZE(THE($blockerName))} raises {POSS-ADJ($blockerName)} {$shield}!
+action-popup-blocking-disabling-other = {CAPITALIZE(THE($blockerName))} lowers {POSS-ADJ($blockerName)} {$shield}!

 action-popup-blocking-user-cant-block = The gravity here prevents you from blocking.
--- a/Resources/Locale/en-US/actions/actions/disarm-action.ftl
+++ b/Resources/Locale/en-US/actions/actions/disarm-action.ftl
@@ -1,7 +1,7 @@
 disarm-action-free-hand = You need to use a free hand to disarm!

-disarm-action-popup-message-other-clients = {$performerName} fails to disarm {$targetName}!
-disarm-action-popup-message-cursor = You fail to disarm {$targetName}!
+disarm-action-popup-message-other-clients = {CAPITALIZE(THE($performerName))} fails to disarm {THE($targetName)}!
+disarm-action-popup-message-cursor = You fail to disarm {THE($targetName)}!

 action-name-disarm = [color=red]Disarm[/color]
 action-description-disarm = Attempt to [color=red]disarm[/color] someone.
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -21,4 +21,4 @@ injector-component-target-is-empty-message = {$target} is empty!
 ## mob-inject doafter messages

 injector-component-injecting-user = You start inserting the needle.
-injector-component-injecting-target = {$user} is trying to stick a needle into you!
+injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to stick a needle into you!
--- a/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl
+++ b/Resources/Locale/en-US/entity-systems/pointing/pointing-system.ftl
@@ -2,9 +2,9 @@

 pointing-system-try-point-cannot-reach = You can't reach there!
 pointing-system-point-at-self = You point at yourself.
-pointing-system-point-at-other = You point at {$other}.
-pointing-system-point-at-self-others = {$otherName} points at {$other}.
-pointing-system-point-at-other-others = {$otherName} points at {$other}.
+pointing-system-point-at-other = You point at {THE($other)}.
+pointing-system-point-at-self-others = {CAPITALIZE(THE($otherName))} points at {THE($other)}.
+pointing-system-point-at-other-others = {CAPITALIZE(THE($otherName))} points at {THE($other)}.
 pointing-system-point-at-you-other = {$otherName} points at you.
 pointing-system-point-at-tile = You point at the {$tileName}.
-pointing-system-other-point-at-tile = {$otherName} points at the {$tileName}.
+pointing-system-other-point-at-tile = {CAPITALIZE(THE($otherName))} points at the {$tileName}.
--- a/Resources/Locale/en-US/hands/components/hands-component.ftl
+++ b/Resources/Locale/en-US/hands/components/hands-component.ftl
@@ -1,4 +1,4 @@
-hands-component-disarm-success-others-message = {$disarmer} disarms {$disarmed}!
-hands-component-disarm-success-message = You disarm {$disarmed}!
-hands-component-shove-success-others-message = {$shover} shoves {$shoved}!
-hands-component-shove-success-message = You shove {$shoved}!
+hands-component-disarm-success-others-message = {CAPITALIZE(THE($disarmer))} disarms {THE($disarmed)}!
+hands-component-disarm-success-message = You disarm {THE($disarmed)}!
+hands-component-shove-success-others-message = {CAPITALIZE(THE($shover))} shoves {THE($shoved)}!
+hands-component-shove-success-message = You shove {THE($shoved)}!
--- a/Resources/Locale/en-US/identity/identity-system.ftl
+++ b/Resources/Locale/en-US/identity/identity-system.ftl
@@ -0,0 +1,9 @@
+identity-unknown-name = ???
+
+identity-age-young = young
+identity-age-middle-aged = middle-aged
+identity-age-old = old
+
+identity-gender-feminine = woman
+identity-gender-masculine = man
+identity-gender-person = person
--- a/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl
+++ b/Resources/Locale/en-US/stunnable/components/stunnable-component.ftl
@@ -1,2 +1,2 @@
-stunnable-component-disarm-success-others = {$source} pushes {$target}!
-stunnable-component-disarm-success = You push {$target}!
+stunnable-component-disarm-success-others = {CAPITALIZE(THE($source))} pushes {THE($target)}!
+stunnable-component-disarm-success = You push {THE($target)}!
--- a/Resources/Locale/en-US/stunnable/stun-system.ftl
+++ b/Resources/Locale/en-US/stunnable/stun-system.ftl
@@ -1,2 +1,2 @@
-stunned-component-disarm-success = You push {$target} down!
-stunned-component-disarm-success-others = {$source} pushes {$target} down!
+stunned-component-disarm-success = You push {THE($target)} down!
+stunned-component-disarm-success-others = {CAPITALIZE(THE($source))} pushes {THE($target)} down!
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -42,6 +42,7 @@
    - HidesHair
  - type: DiseaseProtection
    protection: 0.05
+  - type: IdentityBlocker

 - type: entity
  abstract: true
@@ -76,6 +77,7 @@
    - HidesHair
  - type: DiseaseProtection
    protection: 0.05
+  - type: IdentityBlocker

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -17,6 +17,7 @@
        Blunt: 0.5
        Slash: 0.8
        Piercing: 0.8
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadEVAHelmetBase
@@ -143,6 +144,7 @@
  - type: Tag
    tags:
    - HidesHair
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadEVAHelmetBase
@@ -167,6 +169,7 @@
  - type: Clothing
    sprite: Clothing/Head/Helmets/templar.rsi
  - type: IngestionBlocker
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadBase
@@ -190,6 +193,7 @@
  - type: Clothing
    sprite: Clothing/Head/Helmets/wizardhelm.rsi
  - type: IngestionBlocker
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
@@ -221,7 +225,7 @@
  - type: PressureProtection
    highPressureMultiplier: 0.65
    lowPressureMultiplier: 1000
-
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadHardsuitWithLightBase
@@ -250,6 +254,7 @@
  - type: PressureProtection
    highPressureMultiplier: 0.45
    lowPressureMultiplier: 1000
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadBase
@@ -268,6 +273,7 @@
        Slash: 0.5
        Piercing: 0.5
        Heat: 0.9
+  - type: IdentityBlocker

 - type: entity
  parent: ClothingHeadEVAHelmetBase
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -6,6 +6,7 @@
  components:
  - type: IngestionBlocker
  - type: FlashImmunity
+  - type: IdentityBlocker

 - type: entity
  parent: WeldingMaskBase
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -12,9 +12,10 @@
  - type: IngestionBlocker
  - type: DiseaseProtection
    protection: 0.05
+  - type: IdentityBlocker

 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
  id: ClothingMaskGasSecurity
  name: security gas mask
  description: A standard issue Security gas mask.
@@ -23,13 +24,9 @@
    sprite: Clothing/Mask/gassecurity.rsi
  - type: Clothing
    sprite: Clothing/Mask/gassecurity.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05

 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
  id: ClothingMaskGasSyndicate
  name: syndicate gas mask
  description: A close-fitting tactical mask that can be connected to an air supply.
@@ -38,14 +35,10 @@
    sprite: Clothing/Mask/gassyndicate.rsi
  - type: Clothing
    sprite: Clothing/Mask/gassyndicate.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
  - type: FlashImmunity

 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
  id: ClothingMaskGasAtmos
  name: atmospheric gas mask
  description: Improved gas mask utilized by atmospheric technicians. It's flameproof!
@@ -54,10 +47,6 @@
    sprite: Clothing/Mask/gasatmos.rsi
  - type: Clothing
    sprite: Clothing/Mask/gasatmos.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
  - type: Armor
    modifiers:
      coefficients:
@@ -94,7 +83,7 @@
    protection: 0.05

 - type: entity
-  parent: ClothingMaskPullableBase
+  parent: ClothingMaskGas
  id: ClothingMaskGasExplorer
  name: explorer gas mask
  description: A military-grade gas mask that can be connected to an air supply.
@@ -103,10 +92,6 @@
    sprite: Clothing/Mask/gasexplorer.rsi
  - type: Clothing
    sprite: Clothing/Mask/gasexplorer.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: DiseaseProtection
-    protection: 0.05
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -32,6 +32,7 @@
      - !type:WashCreamPieReaction
  - type: Flashable
  - type: Polymorphable
+  - type: Identity
  - type: Hands
  - type: MovementSpeedModifier
  - type: MovedByPressure