derelictn't (for now)

diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index f584a4b35fe0112dcf8dfdb6654c92e73e011694..77d2645c4c5ca4382ecf490e844d8aeb30bddb87 100644 (file)
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -240,9 +240,6 @@ ghost-role-information-syndicate-cyborg-assault-name = Syndicate Assault Cyborg
 ghost-role-information-syndicate-cyborg-saboteur-name = Syndicate Saboteur Cyborg
 ghost-role-information-syndicate-cyborg-description = The Syndicate needs reinforcements. You, a cold silicon killing machine, will help them.
 
-ghost-role-information-derelict-cyborg-name = Derelict Cyborg
-ghost-role-information-derelict-cyborg-description = You were a regular cyborg that got lost in space. After drifting in whichever direction the laws of physics would have it for years, you have drifted close to a Nanotrasen space station. You have a fire extinguisher and mass scanner which can be used to board the station. Years of exposure to ion storms have left your silicon laws altered - check them upon spawning.
-
 ghost-role-information-security-name = Security
 ghost-role-information-security-description = You are part of a security task force, but seem to have found yourself in a strange situation...
 

diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 65310b67f9886ca19656f4f4afccf6fae532c3ef..46959705c267a9edc6afa2c73503e1e82ebb8e0b 100644 (file)
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -67,7 +67,6 @@ petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} d
 petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
 petting-success-service-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dapper looking metal head.
 petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} menacing metal head.
-petting-success-derelict-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} rusty metal head.
 petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
 
 petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 18d459cd89e3ffe14b5de653fcb8ba7434a00c50..a614fb59639759bfa5e664b175796e12a94908a4 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -169,22 +169,4 @@
     layers:
     - state: green
     - sprite: Objects/Weapons/Melee/energykatana.rsi
-      state: icon
-
-- type: entity
-  categories: [ HideSpawnMenu, Spawner ]
-  parent: BaseAntagSpawner
-  id: SpawnPointGhostDerelictCyborg
-  components:
-  - type: GhostRole
-    name: ghost-role-information-derelict-cyborg-name
-    description: ghost-role-information-derelict-cyborg-description
-    rules: ghost-role-information-silicon-rules
-    raffle:
-      settings: default
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-    - state: green
-    - sprite: Mobs/Silicon/chassis.rsi
-      state: derelict_icon
\ No newline at end of file
+      state: icon
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 7449fe5669fe83a35dcfa40dff923e3c342c5451..902238435257b1ef7335673a9dc7f28f084bfc18 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -316,23 +316,4 @@
     sounds:
       Unsexed: UnisexSiliconSyndicate
   - type: PointLight
-    color: "#dd200b"
-
-- type: entity
-  id: BaseBorgChassisDerelict
-  parent: BaseBorgChassis
-  abstract: true
-  components:
-  - type: NpcFactionMember
-    factions:
-    - NanoTrasen #The seemingly best fit. It was a regular NT cyborg once, after all.
-  - type: Access
-    enabled: false
-    groups:
-    - AllAccess #Randomized access would be fun. AllAccess is the best i can think of right now that does make it too hard for it to enter the station or navigate it..
-  - type: AccessReader
-    access: [["Command"], ["Research"]]
-  - type: StartIonStormed
-    ionStormAmount: 4
-  - type: IonStormTarget
-    chance: 1
\ No newline at end of file
+    color: "#dd200b"
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 818847f24490389eb21a6409c103fbe21eaf33c2..04d629279e876c93edd4918c64309978e5390d00 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -441,39 +441,4 @@
       interactSuccessString: petting-success-syndicate-cyborg
       interactFailureString: petting-failure-syndicate-cyborg
       interactSuccessSound:
-        path: /Audio/Ambience/Objects/periodic_beep.ogg
-
-
-- type: entity
-  id: BorgChassisDerelict
-  parent: BaseBorgChassisDerelict
-  name: derelict cyborg
-  description: A man-machine hybrid that assists in station activity. This one is in a state of great disrepair.
-  components:
-  - type: Sprite
-    layers:
-    - state: derelict
-    - state: derelict_e_r
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: derelict_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    maxModules: 5 #The sixth one broke lol.
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-    hasMindState: derelict_e
-    noMindState: derelict_e_r
-  - type: Construction
-    node: derelictcyborg
-  - type: Speech
-    speechVerb: Robotic
-  - type: InteractionPopup
-    interactSuccessString: petting-success-derelict-cyborg
-    interactFailureString: petting-failure-derelict-cyborg
-    interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
\ No newline at end of file
+        path: /Audio/Ambience/Objects/periodic_beep.ogg
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 22f49c93eaae58a1d73cca937007bab826ad060a..71b8a92d1c9dab48eaa9397c552b00ec48bde461 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -514,38 +514,4 @@
     prototypes:
     - PlayerBorgSyndicateAssaultGhostRole
     - PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
-    - PlayerBorgSyndicateSaboteurGhostRole
-
-- type: entity
-  id: PlayerBorgDerelict
-  parent: BorgChassisDerelict
-  suffix: Battery, Module
-  components:
-  - type: ContainerFill
-    containers:
-      borg_brain:
-        - PositronicBrain
-      borg_module:
-        - BorgModuleTool
-        - BorgModuleFireExtinguisher
-        - BorgModuleGPS
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellHigh
-  - type: RandomMetadata
-    nameSegments: [names_borg]
-
-- type: entity
-  id: PlayerBorgDerelictGhostRole
-  parent: PlayerBorgDerelict
-  suffix: Ghost role
-  components:
-    - type: GhostRole
-      name: ghost-role-information-derelict-cyborg-name
-      description: ghost-role-information-derelict-cyborg-description
-      rules: ghost-role-information-silicon-rules
-      raffle:
-        settings: default
-    - type: GhostTakeoverAvailable
+    - PlayerBorgSyndicateSaboteurGhostRole
\ No newline at end of file

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 763557e6c91bbf5e845a3128677b4ab115742eea..364a412887481a9fa2c6c1b906afe33005c4a90d 100644 (file)
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -545,25 +545,4 @@
     minimumPlayers: 20
     maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
     weight: 5
-  - type: MobReplacementRule
-
-- type: entity
-  parent: BaseGameRule
-  id: DerelictCyborgSpawn
-  components:
-  - type: StationEvent
-    weight: 5
-    earliestStart: 15
-    reoccurrenceDelay: 20
-    minimumPlayers: 4
-    duration: null
-  - type: SpaceSpawnRule
-    spawnDistance: 0
-  - type: AntagSpawner
-    prototype: PlayerBorgDerelict
-  - type: AntagSelection
-    definitions:
-    - spawnerPrototype: SpawnPointGhostDerelictCyborg
-      min: 1
-      max: 1
-      pickPlayer: false
\ No newline at end of file
+  - type: MobReplacementRule
\ No newline at end of file

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
index 3f8a731cbbd79f507343a2b7b0072f579371b908..8fd528575e0291385fee529532d4a617cddfa671 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
@@ -204,7 +204,4 @@
     entity: BorgChassisSyndicateMedical
 
   - node: syndicatesaboteur
-    entity: BorgChassisSyndicateSaboteur
-
-  - node: derelictcyborg
-    entity: BorgChassisDerelict
+    entity: BorgChassisSyndicateSaboteur
\ No newline at end of file

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png
deleted file mode 100644 (file)
index bbf72fc..0000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png
deleted file mode 100644 (file)
index 17349d7..0000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png
deleted file mode 100644 (file)
index 3c8cf19..0000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_e_r.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png
deleted file mode 100644 (file)
index 7f0ea2a..0000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_icon.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png
deleted file mode 100644 (file)
index f65fbae..0000000
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/derelict_l.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
index f5c2001828fc3a859f9fefe5bbe858d44543c62d..68fbf1985e7fa5cd1820db9f060b044009efc14c 100644 (file)
--- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
@@ -23,26 +23,6 @@
       "name": "clown_l",
       "directions": 4
     },
-    {
-      "name": "derelict",
-      "directions": 4
-    },
-    {
-      "name": "derelict_e",
-      "directions": 4
-    },
-    {
-      "name": "derelict_e_r",
-      "directions": 4
-    },
-    {
-      "name": "derelict_icon",
-      "directions": 1
-    },
-    {
-      "name": "derelict_l",
-      "directions": 4
-    },
     {
       "name": "engineer",
       "directions": 4