diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 5e2bba579f..071bf85549 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -45978,4 +45978,11 @@ entities: type: Transform - anchored: False type: Collidable +- uid: 3957 + type: SpawnPointMime + components: + - parent: 857 + pos: -19.5,-8.5 + rot: -1.5707963267948966 rad + type: Transform ... diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml index 3512267b89..78e10568b3 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml @@ -38,7 +38,6 @@ id: SpawnPointBartender parent: SpawnPointJobBase name: spawn point (bartender) - components: - type: SpawnPoint job_id: Bartender @@ -52,7 +51,6 @@ id: SpawnPointChef parent: SpawnPointJobBase name: spawn point (chef) - components: - type: SpawnPoint job_id: Chef @@ -66,7 +64,6 @@ id: SpawnPointClown parent: SpawnPointJobBase name: spawn point (clown) - components: - type: SpawnPoint job_id: Clown @@ -75,12 +72,24 @@ - type: Icon state: Clown +# Mime +- type: entity + id: SpawnPointMime + parent: SpawnPointJobBase + name: spawn point (mime) + components: + - type: SpawnPoint + job_id: Mime + - type: Sprite + state: Mime + - type: Icon + state: Mime + # Janitor - type: entity id: SpawnPointJanitor parent: SpawnPointJobBase name: spawn point (janitor) - components: - type: SpawnPoint job_id: Janitor @@ -94,7 +103,6 @@ id: SpawnPointCaptain parent: SpawnPointJobBase name: spawn point (captain) - components: - type: SpawnPoint job_id: Captain @@ -108,7 +116,6 @@ id: SpawnPointHeadOfPersonnel parent: SpawnPointJobBase name: spawn point (headofpersonnel) - components: - type: SpawnPoint job_id: HeadOfPersonnel @@ -122,7 +129,6 @@ id: SpawnPointChiefEngineer parent: SpawnPointJobBase name: spawn point (chiefengineer) - components: - type: SpawnPoint job_id: ChiefEngineer @@ -136,7 +142,6 @@ id: SpawnPointStationEngineer parent: SpawnPointJobBase name: spawn point (stationengineer) - components: - type: SpawnPoint job_id: StationEngineer @@ -150,7 +155,6 @@ id: SpawnPointChiefMedicalOfficer parent: SpawnPointJobBase name: spawn point (chiefmedicalofficer) - components: - type: SpawnPoint job_id: ChiefMedicalOfficer @@ -164,7 +168,6 @@ id: SpawnPointMedicalDoctor parent: SpawnPointJobBase name: spawn point (medicaldoctor) - components: - type: SpawnPoint job_id: MedicalDoctor @@ -178,7 +181,6 @@ id: SpawnPointResearchDirector parent: SpawnPointJobBase name: spawn point (researchdirector) - components: - type: SpawnPoint job_id: ResearchDirector @@ -192,7 +194,6 @@ id: SpawnPointScientist parent: SpawnPointJobBase name: spawn point (scientist) - components: - type: SpawnPoint job_id: Scientist @@ -206,7 +207,6 @@ id: SpawnPointHeadOfSecurity parent: SpawnPointJobBase name: spawn point (headofsecurity) - components: - type: SpawnPoint job_id: HeadOfSecurity @@ -220,7 +220,6 @@ id: SpawnPointSecurityOfficer parent: SpawnPointJobBase name: spawn point (securityofficer) - components: - type: SpawnPoint job_id: SecurityOfficer diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 0675fd443f..c6e848a267 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -92,6 +92,27 @@ layer: - MobImpassable +- type: entity + name: Mime PDA + parent: BasePDA + id: MimePDA + description: Suprisingly not on mute. + components: + - type: PDA + idCard: MimeIDCard + - type: Icon + sprite: Objects/Devices/pda.rsi + state: pda-mime + - type: Sprite + sprite: Objects/Devices/pda.rsi + netsync: false + layers: + - state: pda-mime + map: ["enum.PDAVisualLayers.Base"] + - state: light_overlay + shader: unshaded + map: ["enum.PDAVisualLayers.Flashlight"] + - type: entity name: Cargo PDA parent: BasePDA diff --git a/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml similarity index 93% rename from Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml rename to Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0364c3a024..899cb9c7b8 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -6,13 +6,13 @@ abstract: true components: - type: Sprite - sprite: Clothing/Belt/id_cards.rsi + sprite: Objects/Misc/id_cards.rsi - type: Icon - sprite: Clothing/Belt/id_cards.rsi + sprite: Objects/Misc/id_cards.rsi - type: Clothing Slots: - idcard - sprite: Clothing/Belt/id_cards.rsi + sprite: Objects/Misc/id_cards.rsi HeldPrefix: default - type: Access - type: IdCard @@ -141,6 +141,21 @@ - type: PresetIdCard job: Clown +- type: entity + parent: IDCardStandard + id: MimeIDCard + name: mime ID card + components: + - type: Sprite + layers: + - state: default + - state: assigned + - state: idmime + - type: Icon + state: idmime + - type: PresetIdCard + job: Mime + - type: entity parent: IDCardStandard id: JanitorIDCard diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml new file mode 100644 index 0000000000..ec6e82ead2 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -0,0 +1,25 @@ +- type: job + id: Mime + name: "mime" + positions: 1 + startingGear: MimeGear + department: + - Civilian + icon: "Mime" + access: + - Theatre + - Maintenance + +- type: startingGear + id: MimeGear + equipment: + innerclothing: UniformMime + backpack: BackpackClothing + head: HatBeret + belt: SuspendersClothing + gloves: GlovesWhite + shoes: ShoesMime + pocket1: Pen + pocket2: Paper + mask: MaskMime + idcard: MimePDA diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/meta.json b/Resources/Textures/Clothing/Belt/id_cards.rsi/meta.json deleted file mode 100644 index 7575d54e9b..0000000000 --- a/Resources/Textures/Clothing/Belt/id_cards.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "assigned", "directions": 1, "delays": [[1.0]]}, {"name": "gold", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 1, "delays": [[1.0]]}, {"name": "idassistant", "directions": 1, "delays": [[1.0]]}, {"name": "idcaptain", "directions": 1, "delays": [[1.0]]}, {"name": "idcargotechnician", "directions": 1, "delays": [[1.0]]}, {"name": "idcentcom", "directions": 1, "delays": [[1.0]]}, {"name": "idchiefengineer", "directions": 1, "delays": [[1.0]]}, {"name": "idchiefmedicalofficer", "directions": 1, "delays": [[1.0]]}, {"name": "idclown", "directions": 1, "delays": [[1.0]]}, {"name": "idheadofpersonnel", "directions": 1, "delays": [[1.0]]}, {"name": "idheadofsecurity", "directions": 1, "delays": [[1.0]]}, {"name": "idjanitor", "directions": 1, "delays": [[1.0]]}, {"name": "idmedicaldoctor", "directions": 1, "delays": [[1.0]]}, {"name": "idresearchdirector", "directions": 1, "delays": [[1.0]]}, {"name": "idscientist", "directions": 1, "delays": [[1.0]]}, {"name": "idsecurityofficer", "directions": 1, "delays": [[1.0]]}, {"name": "idcargotechnician", "directions": 1, "delays": [[1.0]]}, {"name": "idstationengineer", "directions": 1, "delays": [[1.0]]}, {"name": "silver", "directions": 1, "delays": [[1.0]]}, {"name": "default-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "gold-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "silver-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "gold-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "silver-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "idbartender", "directions": 1, "delays": [[1.0]]}, {"name": "idcook", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/assigned.png b/Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/assigned.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-left.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/default-inhand-left.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/default-inhand-right.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/default-inhand-right.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/default.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/default.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-left.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/gold-inhand-left.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/gold-inhand-right.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/gold-inhand-right.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/gold.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/gold.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idassistant.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idassistant.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idbartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idbartender.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idcaptain.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idcargotechnician.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idcentcom.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefengineer.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idchiefmedicalofficer.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idclown.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idcook.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofpersonnel.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idheadofsecurity.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idjanitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idjanitor.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idmedicaldoctor.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png new file mode 100644 index 0000000000..5f2c9cec76 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png differ diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idresearchdirector.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idscientist.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idsecurityofficer.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/idstationengineer.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 0000000000..5f22cd0c9d --- /dev/null +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,324 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assigned", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "gold", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "default", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idassistant", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idcaptain", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idcargotechnician", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idcentcom", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idchiefengineer", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idchiefmedicalofficer", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idclown", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idheadofpersonnel", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idheadofsecurity", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idjanitor", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idmedicaldoctor", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idresearchdirector", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idscientist", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idsecurityofficer", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idcargotechnician", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idstationengineer", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idmime", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "silver", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "default-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "gold-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "silver-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "default-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "gold-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "silver-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "idbartender", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "idcook", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-left.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/silver-inhand-left.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/silver-inhand-right.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/silver-inhand-right.png diff --git a/Resources/Textures/Clothing/Belt/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png similarity index 100% rename from Resources/Textures/Clothing/Belt/id_cards.rsi/silver.png rename to Resources/Textures/Objects/Misc/id_cards.rsi/silver.png