Skip to content

Commit

Permalink
Merge branch 'master' into Revert-New-Shotgun-Sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
@ps3moira
ps3moira authored Dec 31, 2023
2 parents c5567d9 + 3a72289 commit 51be183
Show file tree
Hide file tree
Showing 14 changed files with 34,266 additions and 37,196 deletions.
18 changes: 18 additions & 0 deletions Resources/Changelog/DeltaVChangelog.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,3 +1260,21 @@ Entries:
message: Mail no longer has throwing damage.
id: 188
time: '2023-12-29T19:53:10.0000000+00:00'
- author: Velcroboy
changes:
- type: Remove
message: Space winter is officially over!
id: 189
time: '2023-12-30T14:15:42.0000000+00:00'
- author: Master2112
changes:
- type: Fix
message: Fixed incorrect reference to ftl in crimeassist yaml
id: 190
time: '2023-12-30T22:03:53.0000000+00:00'
- author: Adrian16199
changes:
- type: Add
message: Added a fluffy tail for the felinids.
id: 191
time: '2023-12-30T22:05:52.0000000+00:00'
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/deltav/markings/felinid.ftl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
marking-FelinidFluffyTail-Felinid_fluffy_tail_full = Fluffy Tail
marking-FelinidFluffyTailRings-Felinid_fluffy_tail_full = Fluffy tail
marking-FelinidFluffyTailRings-felinid_fluffy_tail_rings = Fluffy Tail Rings
marking-FelinidFluffyTail = Fluffy Tail
marking-FelinidFluffyTailRings = Fluffy Tail with rings
13,211 changes: 6,221 additions & 6,990 deletions Resources/Maps/arena.yml
View file

Large diffs are not rendered by default.

525 changes: 243 additions & 282 deletions Resources/Maps/asterisk.yml
View file

Large diffs are not rendered by default.

1,026 changes: 392 additions & 634 deletions Resources/Maps/edge.yml
View file

Large diffs are not rendered by default.

804 changes: 346 additions & 458 deletions Resources/Maps/hive.yml
View file

Large diffs are not rendered by default.

49,905 changes: 24,096 additions & 25,809 deletions Resources/Maps/pebble.yml
View file

Large diffs are not rendered by default.

1,617 changes: 400 additions & 1,217 deletions Resources/Maps/shoukou.yml
View file

Large diffs are not rendered by default.

4,218 changes: 2,413 additions & 1,805 deletions Resources/Maps/tortuga.yml
View file

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: marking
id: FelinidFluffyTailRings
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Felinid]
sprites:
- sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
state: Felinid_fluffy_tail_full
- sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
state: felinid_fluffy_tail_rings

- type: marking
id: FelinidFluffyTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Felinid]
sprites:
- sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
state: Felinid_fluffy_tail_full

2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/cartridges/crimeassistflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

- type: crimeAssistPage
id: "questionIsVictimRemovedFromBody"
locKey: "crime-assist-question-victimremovedfrombody"
locKey: "crime-assist-question-isvictimremovedfrombody"
onYes: "resultDecorporealisation"
onNo: "questionWasDeathIntentional"

Expand Down
Binary file added ...eltaV/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.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 ...ltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.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.
111 changes: 111 additions & 0 deletions Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"version": 1,
"copyright": "Made by Adrian16199",
"license": "CC-BY-SA-4.0",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "felinid_fluffy_tail_rings",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "Felinid_fluffy_tail_full",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
}
]
}

0 comments on commit 51be183

Please sign in to comment.