Skip to content

Commit

Permalink
Merge branch 'master' into QoL_evacuation
Browse files Browse the repository at this point in the history
  • Loading branch information
@PyotrIgn
PyotrIgn authored Aug 24, 2024
2 parents 414f44a + 41f6ed2 commit 467ad53
Show file tree
Hide file tree
Showing 16 changed files with 273 additions and 11 deletions.
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Economy/salary.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@
ADTRoboticist: 400
Scientist: 300
ResearchAssistant: 200
Brigmedic: 400
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/game_presets.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- ghosts
name: phantom-title
minPlayers: 25
showInVote: true
description: phantom-description
rules:
- PhantomGameRule
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions Resources/Prototypes/secret_weights.yml
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/aslime-_3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
261 changes: 261 additions & 0 deletions Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_baby_slime_dead.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/rainbow_slime_extract.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 467ad53

Please sign in to comment.