Skip to content

Bug fixes and fixing some poorly implemented features (requires MM 7836 Implement Elevators) #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HammerGS wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug fixes and fixing some poorly implemented features (requires MM 7836 Implement Elevators) #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35f071e
Bug fixes and fixing some poorly implemented features
HammerGS Jun 29, 2026
9aa5dd8
Updating Tilesets
HammerGS Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions data/images/hexes/StandardIncludes/StandardElevator.tileinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@

# Standard elevator signs

super * "elevator:0" "" "boring/elevator1.gif"
super * "elevator:1" "" "boring/elevator1.gif"
super * "elevator:2" "" "boring/elevator2.gif"
super * "elevator:3" "" "boring/elevator2.gif"
super * "elevator:4" "" "boring/elevator2.gif"
super * "elevator:5" "" "boring/elevator3.gif"
super * "elevator:6" "" "boring/elevator3.gif"
super * "elevator:7" "" "boring/elevator3.gif"
super * "elevator:8" "" "boring/elevator4.gif"
super * "elevator:9" "" "boring/elevator4.gif"
super * "elevator:10" "" "boring/elevator4.gif"
super * "elevator:-1" "" "boring/elevator5.gif"
super * "elevator:-2" "" "boring/elevator5.gif"
super * "elevator:-3" "" "boring/elevator5.gif"
super * "elevator:-4" "" "boring/elevator5.gif"
super * "elevator:-5" "" "boring/elevator6.gif"
super * "elevator:-6" "" "boring/elevator6.gif"
super * "elevator:-7" "" "boring/elevator6.gif"
super * "elevator:-8" "" "boring/elevator6.gif"
super * "elevator:-9" "" "boring/elevator6.gif"
super * "elevator:-10" "" "boring/elevator6.gif"
super * "solaris_elevator:0" "" "boring/elevator1.gif"
super * "solaris_elevator:1" "" "boring/elevator1.gif"
super * "solaris_elevator:2" "" "boring/elevator2.gif"
super * "solaris_elevator:3" "" "boring/elevator2.gif"
super * "solaris_elevator:4" "" "boring/elevator2.gif"
super * "solaris_elevator:5" "" "boring/elevator3.gif"
super * "solaris_elevator:6" "" "boring/elevator3.gif"
super * "solaris_elevator:7" "" "boring/elevator3.gif"
super * "solaris_elevator:8" "" "boring/elevator4.gif"
super * "solaris_elevator:9" "" "boring/elevator4.gif"
super * "solaris_elevator:10" "" "boring/elevator4.gif"
super * "solaris_elevator:-1" "" "boring/elevator5.gif"
super * "solaris_elevator:-2" "" "boring/elevator5.gif"
super * "solaris_elevator:-3" "" "boring/elevator5.gif"
super * "solaris_elevator:-4" "" "boring/elevator5.gif"
super * "solaris_elevator:-5" "" "boring/elevator6.gif"
super * "solaris_elevator:-6" "" "boring/elevator6.gif"
super * "solaris_elevator:-7" "" "boring/elevator6.gif"
super * "solaris_elevator:-8" "" "boring/elevator6.gif"
super * "solaris_elevator:-9" "" "boring/elevator6.gif"
super * "solaris_elevator:-10" "" "boring/elevator6.gif"
12 changes: 6 additions & 6 deletions data/images/hexes/StandardIncludes/StandardFluff.tileinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

# Standard fluff images

super * "elevator:*:01" "" "boring/elevator1.gif"
super * "elevator:*:02" "" "boring/elevator2.gif"
super * "elevator:*:04" "" "boring/elevator3.gif"
super * "elevator:*:08" "" "boring/elevator4.gif"
super * "elevator:*:16" "" "boring/elevator5.gif"
super * "elevator:*:32" "" "boring/elevator6.gif"
super * "solaris_elevator:*:01" "" "boring/elevator1.gif"
super * "solaris_elevator:*:02" "" "boring/elevator2.gif"
super * "solaris_elevator:*:04" "" "boring/elevator3.gif"
super * "solaris_elevator:*:08" "" "boring/elevator4.gif"
super * "solaris_elevator:*:16" "" "boring/elevator5.gif"
super * "solaris_elevator:*:32" "" "boring/elevator6.gif"

super * "geyser:1" "" "boring/geyservent.gif"
super * "geyser:2" "" "boring/geysererupt.gif"
Expand Down
4 changes: 2 additions & 2 deletions data/images/hexes/defaulthexset.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ ortho * "bridge:*:61;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_61.gif"
ortho * "bridge:*:62;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_62.gif"
ortho * "bridge:*:63;bridge_elev:*;bridge_cf:*" "" "bridge/bridge_63.gif"

super * "elevator:10" "" "boring/elevator1.gif"
super * "elevator:2" "" "boring/elevator2.gif"
super * "solaris_elevator:10" "" "boring/elevator1.gif"
super * "solaris_elevator:2" "" "boring/elevator2.gif"

super * "geyser:1" "" "boring/geyservent.gif"
super * "geyser:2" "" "boring/geysererupt.gif"
Expand Down
68 changes: 46 additions & 22 deletions data/images/hexes/hq_saxarba.tileset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,28 +122,52 @@ include "saxarba/SMV_Fluff/GardenLakes.tileinc"
super * "water:0" "" "saxarba/water/water_anim_0.gif"

#ELEVATOR
super * "elevator:10" "" "saxarba/misc/elevator_10.png"
super * "elevator:9" "" "saxarba/misc/elevator_9.png"
super * "elevator:8" "" "saxarba/misc/elevator_8.png"
super * "elevator:7" "" "saxarba/misc/elevator_7.png"
super * "elevator:6" "" "saxarba/misc/elevator_6.png"
super * "elevator:5" "" "saxarba/misc/elevator_5.png"
super * "elevator:4" "" "saxarba/misc/elevator_4.png"
super * "elevator:3" "" "saxarba/misc/elevator_3.png"
super * "elevator:2" "" "saxarba/misc/elevator_2.png"
super * "elevator:1" "" "saxarba/misc/elevator_1.png"
super * "elevator:0" "" "saxarba/misc/elevator_0.png"
super * "elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "elevator:*" "" "saxarba/misc/elevator_0.png"
super * "solaris_elevator:10" "" "saxarba/misc/elevator_10.png"
super * "solaris_elevator:9" "" "saxarba/misc/elevator_9.png"
super * "solaris_elevator:8" "" "saxarba/misc/elevator_8.png"
super * "solaris_elevator:7" "" "saxarba/misc/elevator_7.png"
super * "solaris_elevator:6" "" "saxarba/misc/elevator_6.png"
super * "solaris_elevator:5" "" "saxarba/misc/elevator_5.png"
super * "solaris_elevator:4" "" "saxarba/misc/elevator_4.png"
super * "solaris_elevator:3" "" "saxarba/misc/elevator_3.png"
super * "solaris_elevator:2" "" "saxarba/misc/elevator_2.png"
super * "solaris_elevator:1" "" "saxarba/misc/elevator_1.png"
super * "solaris_elevator:0" "" "saxarba/misc/elevator_0.png"
super * "solaris_elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "solaris_elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "solaris_elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "solaris_elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "solaris_elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "solaris_elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "solaris_elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "solaris_elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "solaris_elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "solaris_elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "solaris_elevator:*" "" "saxarba/misc/elevator_0.png"

#INDUSTRIAL ELEVATOR
super * "industrial_elevator:10" "" "saxarba/misc/elevator_10.png"
super * "industrial_elevator:9" "" "saxarba/misc/elevator_9.png"
super * "industrial_elevator:8" "" "saxarba/misc/elevator_8.png"
super * "industrial_elevator:7" "" "saxarba/misc/elevator_7.png"
super * "industrial_elevator:6" "" "saxarba/misc/elevator_6.png"
super * "industrial_elevator:5" "" "saxarba/misc/elevator_5.png"
super * "industrial_elevator:4" "" "saxarba/misc/elevator_4.png"
super * "industrial_elevator:3" "" "saxarba/misc/elevator_3.png"
super * "industrial_elevator:2" "" "saxarba/misc/elevator_2.png"
super * "industrial_elevator:1" "" "saxarba/misc/elevator_1.png"
super * "industrial_elevator:0" "" "saxarba/misc/elevator_0.png"
super * "industrial_elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "industrial_elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "industrial_elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "industrial_elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "industrial_elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "industrial_elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "industrial_elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "industrial_elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "industrial_elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "industrial_elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "industrial_elevator:*" "" "saxarba/misc/elevator_0.png"

#Basement states have no graphical representation
super * "bldg_basement_type:*" "" "saxarba/misc/blank.png"
Expand Down
68 changes: 46 additions & 22 deletions data/images/hexes/saxarba.tileset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,52 @@ include "saxarba/SMV_Fluff/GardenLakes.tileinc"
include "Structured_Water/Structured_Water - Saxarba - 0.tileinc"

#ELEVATOR
super * "elevator:10" "" "saxarba/misc/elevator_10.png"
super * "elevator:9" "" "saxarba/misc/elevator_9.png"
super * "elevator:8" "" "saxarba/misc/elevator_8.png"
super * "elevator:7" "" "saxarba/misc/elevator_7.png"
super * "elevator:6" "" "saxarba/misc/elevator_6.png"
super * "elevator:5" "" "saxarba/misc/elevator_5.png"
super * "elevator:4" "" "saxarba/misc/elevator_4.png"
super * "elevator:3" "" "saxarba/misc/elevator_3.png"
super * "elevator:2" "" "saxarba/misc/elevator_2.png"
super * "elevator:1" "" "saxarba/misc/elevator_1.png"
super * "elevator:0" "" "saxarba/misc/elevator_0.png"
super * "elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "elevator:*" "" "saxarba/misc/elevator_0.png"
super * "solaris_elevator:10" "" "saxarba/misc/elevator_10.png"
super * "solaris_elevator:9" "" "saxarba/misc/elevator_9.png"
super * "solaris_elevator:8" "" "saxarba/misc/elevator_8.png"
super * "solaris_elevator:7" "" "saxarba/misc/elevator_7.png"
super * "solaris_elevator:6" "" "saxarba/misc/elevator_6.png"
super * "solaris_elevator:5" "" "saxarba/misc/elevator_5.png"
super * "solaris_elevator:4" "" "saxarba/misc/elevator_4.png"
super * "solaris_elevator:3" "" "saxarba/misc/elevator_3.png"
super * "solaris_elevator:2" "" "saxarba/misc/elevator_2.png"
super * "solaris_elevator:1" "" "saxarba/misc/elevator_1.png"
super * "solaris_elevator:0" "" "saxarba/misc/elevator_0.png"
super * "solaris_elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "solaris_elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "solaris_elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "solaris_elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "solaris_elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "solaris_elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "solaris_elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "solaris_elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "solaris_elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "solaris_elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "solaris_elevator:*" "" "saxarba/misc/elevator_0.png"

#INDUSTRIAL ELEVATOR
super * "industrial_elevator:10" "" "saxarba/misc/elevator_10.png"
super * "industrial_elevator:9" "" "saxarba/misc/elevator_9.png"
super * "industrial_elevator:8" "" "saxarba/misc/elevator_8.png"
super * "industrial_elevator:7" "" "saxarba/misc/elevator_7.png"
super * "industrial_elevator:6" "" "saxarba/misc/elevator_6.png"
super * "industrial_elevator:5" "" "saxarba/misc/elevator_5.png"
super * "industrial_elevator:4" "" "saxarba/misc/elevator_4.png"
super * "industrial_elevator:3" "" "saxarba/misc/elevator_3.png"
super * "industrial_elevator:2" "" "saxarba/misc/elevator_2.png"
super * "industrial_elevator:1" "" "saxarba/misc/elevator_1.png"
super * "industrial_elevator:0" "" "saxarba/misc/elevator_0.png"
super * "industrial_elevator:-1" "" "saxarba/misc/elevator_-1.png"
super * "industrial_elevator:-2" "" "saxarba/misc/elevator_-2.png"
super * "industrial_elevator:-3" "" "saxarba/misc/elevator_-3.png"
super * "industrial_elevator:-4" "" "saxarba/misc/elevator_-4.png"
super * "industrial_elevator:-5" "" "saxarba/misc/elevator_-5.png"
super * "industrial_elevator:-6" "" "saxarba/misc/elevator_-6.png"
super * "industrial_elevator:-7" "" "saxarba/misc/elevator_-7.png"
super * "industrial_elevator:-8" "" "saxarba/misc/elevator_-8.png"
super * "industrial_elevator:-9" "" "saxarba/misc/elevator_-9.png"
super * "industrial_elevator:-10" "" "saxarba/misc/elevator_-10.png"
super * "industrial_elevator:*" "" "saxarba/misc/elevator_0.png"

#Basement states have no graphical representation
super * "bldg_basement_type:*" "" "saxarba/misc/blank.png"
Expand Down
12 changes: 6 additions & 6 deletions data/images/hexes/saxarba/Includes/StandardFluff.tileinc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

# Standard fluff images

super * "elevator:*:01" "" "boring/elevator1.gif"
super * "elevator:*:02" "" "boring/elevator2.gif"
super * "elevator:*:04" "" "boring/elevator3.gif"
super * "elevator:*:08" "" "boring/elevator4.gif"
super * "elevator:*:16" "" "boring/elevator5.gif"
super * "elevator:*:32" "" "boring/elevator6.gif"
super * "solaris_elevator:*:01" "" "boring/elevator1.gif"
super * "solaris_elevator:*:02" "" "boring/elevator2.gif"
super * "solaris_elevator:*:04" "" "boring/elevator3.gif"
super * "solaris_elevator:*:08" "" "boring/elevator4.gif"
super * "solaris_elevator:*:16" "" "boring/elevator5.gif"
super * "solaris_elevator:*:32" "" "boring/elevator6.gif"

super * "fluff:5:00" "" "fluff/cars_1.gif"
super * "fluff:5:01" "" "fluff/cars_2.gif"
Expand Down
Binary file removed data/images/hexes/saxarba/elevator_-1.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-10.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-2.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-3.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-4.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-5.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-6.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-7.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-8.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_-9.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_0.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_1.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_10.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_2.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_3.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_4.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_5.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_6.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_7.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_8.png
View file
Open in desktop
Binary file not shown.
Binary file removed data/images/hexes/saxarba/elevator_9.png
View file
Open in desktop
Binary file not shown.
Loading