summaryrefslogtreecommitdiff
path: root/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-12-30 21:58:12 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-12-30 21:58:12 -0800
commitd4bc63a8f8ee37ec2de2f43734a60ca045e517c3 (patch)
treed49d6000c1d82e7add7cfcccf873f85224ab823c /backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch
parentFix Mr Lapin meet the Isherwood quest looping. (diff)
downloadcataclysm-bn-d4bc63a8f8ee37ec2de2f43734a60ca045e517c3.tar.xz
Updated to 0.5.1
Removed obsolete mods. Revert removal of Alonso. Revert biodiesel working in petrol engines. Revert hard skill caps. Revert three more broken limb changesets. Revert another ammo rebalance changeset. Revert craftable smokeless gunpowder changeset. Revised book chapters revert patch. Fix some bad terrain in the godco patch. Fix some bad terrain in the prison island patch.
Diffstat (limited to 'backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch')
-rw-r--r--backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch b/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch
deleted file mode 100644
index f923ac4..0000000
--- a/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fac99a00b26d617ca185d2546dd97f26a8e693b8 Mon Sep 17 00:00:00 2001
-From: Chaosvolt <chaosvolt@users.noreply.github.com>
-Date: Tue, 14 Nov 2023 12:56:15 -0600
-Subject: [PATCH] feat (interface): new UDP external tileset sprite for signs
- (#3670)
-
-* feat (interface): new UPD external tileset sprite for signs
-
-* Update external_tileset.md
----
- .../External_Tileset_DP_Normal.json | 3 ++-
- .../External_Tileset_DP_Normal.png | Bin 33382 -> 42296 bytes
- .../reference/graphics/external_tileset.md | 8 +++++++-
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/data/json/external_tileset/External_Tileset_DP_Normal.json b/data/json/external_tileset/External_Tileset_DP_Normal.json
-index d25b8d76ac5..b799eceadbf 100644
---- a/data/json/external_tileset/External_Tileset_DP_Normal.json
-+++ b/data/json/external_tileset/External_Tileset_DP_Normal.json
-@@ -55,5 +55,6 @@
- { "id": "armguard_bronze", "fg": 44 },
-- { "id": "overlay_worn_armguard_bronze", "fg": 45 }
-+ { "id": "overlay_worn_armguard_bronze", "fg": 45 },
-+ { "id": "f_sign", "fg": 47 }
- ],
- "sprite_width": 32,
- "sprite_height": 32
-diff --git a/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md b/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md
-index 0f11c64a3a8..68adcf2625b 100644
---- a/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md
-+++ b/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md
-@@ -35,6 +35,8 @@ Links to relevant pull requests, for content covered below:
- [#3221](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3221)
- - Rewired street lights: [#3273](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3273)
- - Alternative ear/tail mutation: [#3340](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3340)
-+- New trees: [#3626](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3626)
-+- Alternative sign sprite: [#3670](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/3670)
-
- ## Undead People
-
-@@ -72,8 +74,9 @@ Ultica are planned for the future.
- - Buckler, including worn and wielded. Item specific to BN.
- - Battle masks, iron and bronze, including worn sprites. Items specific to BN.
- - Bronze arm guards, including worn sprites. Item specific to BN.
-+- Cacao pods. Item specific to BN.
-
--### External_Tileset_DP_Large.png
-+### External_Tileset_DP_Tall.png
-
- - Off state for utility light. Ability to switch on and off specific to BN.
- - Alien nerve cluster, furniture added to mi-go locations in BN.
-@@ -82,6 +85,9 @@ Ultica are planned for the future.
- - Cherry tree uses summer sprite (plus cherry blossom coloration), summer sprite depicted without
- berries, due to harvest season being moved in BN.
- - Rewired street light, including active state. Furniture specific to BN.
-+- Cocoa tree. Terrain specific to BN.
-+- Cocoa plant. Terrain specific to BN.
-+- Override for sign sprite. Removes lettering on the front specific to DDA.
-
- ### alternative_mutation_tileset.png
-
---
-2.42.0
-