diff --git a/Resources/Prototypes/ADT/Economy/salary.yml b/Resources/Prototypes/ADT/Economy/salary.yml index 98e107820be..0fa93ee58a8 100644 --- a/Resources/Prototypes/ADT/Economy/salary.yml +++ b/Resources/Prototypes/ADT/Economy/salary.yml @@ -46,3 +46,4 @@ ADTRoboticist: 400 Scientist: 300 ResearchAssistant: 200 + Brigmedic: 400 diff --git a/Resources/Prototypes/ADT/game_presets.yml b/Resources/Prototypes/ADT/game_presets.yml index 9d61e4950b6..a198e0d9ec5 100644 --- a/Resources/Prototypes/ADT/game_presets.yml +++ b/Resources/Prototypes/ADT/game_presets.yml @@ -5,6 +5,7 @@ - ghosts name: phantom-title minPlayers: 25 + showInVote: true description: phantom-description rules: - PhantomGameRule diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index e31415b2c25..aa2d4794520 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -7,7 +7,7 @@ components: - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/slimes.rsi + sprite: ADT/Mobs/Aliens/slimes.rsi layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: blue_adult_slime diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 3de6555be14..14c10f03c77 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -64,9 +64,9 @@ parent: AirlockMedical id: AirlockChemistry suffix: Chemistry - components: - - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/chemistry.rsi + #components: ADT Revert + #- type: Sprite + # sprite: Structures/Doors/Airlocks/Standard/chemistry.rsi - type: entity parent: Airlock @@ -213,9 +213,9 @@ parent: AirlockMedicalGlass id: AirlockChemistryGlass suffix: Chemistry - components: - - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/chemistry.rsi + # components: ADT Revert + # - type: Sprite + # sprite: Structures/Doors/Airlocks/Glass/chemistry.rsi - type: entity parent: AirlockMedicalGlass diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index df391dac869..60a3c4409b7 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -1,9 +1,8 @@ - type: weightedRandom id: Secret weights: - Phantom: 0.20 - Nukeops: 0.20 - Traitor: 0.40 + Nukeops: 0.25 + Traitor: 0.50 Zombie: 0 Survival: 0 - Revolutionary: 0.20 + Revolutionary: 0.25 diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/aslime-_3.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/aslime-_3.png new file mode 100644 index 00000000000..c5667beba53 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/aslime-_3.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime.png new file mode 100644 index 00000000000..14839f4f4e0 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png new file mode 100644 index 00000000000..d6bfa4b1c84 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime.png new file mode 100644 index 00000000000..78104d92fae Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png new file mode 100644 index 00000000000..b62d15e8c79 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/meta.json b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/meta.json new file mode 100644 index 00000000000..6ec47f7f6f3 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/meta.json @@ -0,0 +1,261 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from the tgstation at https://github.com/tgstation/tgstation/blob/bb89e65aebb14d6ba0ce7fc43363fbc3f1279e79/icons/mob/simple/slimes.dmi resprite created by discord:LunaLita#0840 for Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blue_adult_slime", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "blue_adult_slime_dead" + }, + { + "name": "green_adult_slime", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "green_adult_slime_dead" + }, + { + "name": "yellow_adult_slime", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "yellow_adult_slime_dead" + }, + { + "name": "aslime-_3", + "directions": 4 + }, + { + "name": "rainbow_slime_extract", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "rainbow_baby_slime", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "rainbow_baby_slime_dead", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime.png new file mode 100644 index 00000000000..e608526f020 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime_dead.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime_dead.png new file mode 100644 index 00000000000..beb13939f88 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime_dead.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_slime_extract.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_slime_extract.png new file mode 100644 index 00000000000..139b83a19ad Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_slime_extract.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime.png new file mode 100644 index 00000000000..3d248502e56 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime.png differ diff --git a/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png new file mode 100644 index 00000000000..70c755cfc01 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png differ