Skip to content

Commit

Permalink
feat(content): Remodeled the Bactrian and Mule (#6509)
Browse files Browse the repository at this point in the history
  • Loading branch information
Saugia committed Feb 6, 2022
1 parent 424c1cf commit 6687a47
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 26 deletions.
11 changes: 9 additions & 2 deletions copyright
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,15 @@ Copyright: Gefüllte Taubenbrust <jeaminer23@gmail.com>
License: CC-BY-SA-4.0
Comment: Derived from works by Michael Zahniser (under the same license).

Files:
images/ship/bactrian*
images/ship/mule*
images/thumbnail/bactrian*
images/thumbnail/mule*
Copyright: Saugia <https://github.com/Saugia>
License: CC-BY-SA-4.0
Comment: Derived from works by Michael Zahniser (under the same license).

Files:
images/effect/ember?tear/ember?tear?fire*
images/effect/ember?tear/ember?tear?impact*
Expand All @@ -1384,8 +1393,6 @@ Copyright: X-27 (youtube.com/x-27yt)
License: CC-BY-SA-3.0
Comment: Derived from works by Michael Zahniser (under the same license).



License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
48 changes: 24 additions & 24 deletions data/human/ships.txt
Original file line number Diff line number Diff line change
Expand Up @@ -333,21 +333,21 @@ ship "Bactrian"
"X5200 Ion Steering"
"Hyperdrive"

engine -18 230
engine 18 230
gun -15 -226 "Torpedo Launcher"
gun 15 -226 "Torpedo Launcher"
gun -40 -133 "Sidewinder Missile Launcher"
gun -45 -128 "Sidewinder Missile Launcher"
turret -22 -148 "Heavy Laser Turret"
turret 26 -80 "Heavy Anti-Missile Turret"
turret -41 -20 "Heavy Laser Turret"
turret 32 -7 "Heavy Laser Turret"
turret 53 82 "Heavy Laser Turret"
turret -37 186 "Heavy Anti-Missile Turret"
bay "Fighter" -38 -26
bay "Fighter" 35 36
bay "Fighter" -47 97
engine 18.5 232
engine -15 232
gun -9 -231.5 "Torpedo Launcher"
gun 13.5 -231.5 "Torpedo Launcher"
gun 36.5 -197 "Sidewinder Missile Launcher"
gun 42 -193 "Sidewinder Missile Launcher"
turret 37 -132.5 "Heavy Anti-Missile Turret"
turret -39 -39 "Heavy Laser Turret"
turret 31.5 -26 "Heavy Laser Turret"
turret -42.5 75 "Heavy Laser Turret"
turret 32.5 132 "Heavy Laser Turret"
turret -33.5 192.5 "Heavy Anti-Missile Turret"
bay "Fighter" -43.5 -125
bay "Fighter" 53 -72.5
bay "Fighter" -50 103.5
leak "leak" 30 50
leak "flame" 30 80
leak "big leak" 50 30
Expand Down Expand Up @@ -2420,15 +2420,15 @@ ship "Mule"
"X3200 Ion Steering"
"Hyperdrive"

engine -12 123
engine 12 123
gun -9 -119 "Sidewinder Missile Launcher"
gun 9 -119 "Sidewinder Missile Launcher"
turret 22 -65 "Heavy Anti-Missile Turret"
turret -37 -21 "Heavy Laser Turret"
turret 39 35 "Heavy Laser Turret"
turret -9 59 "Heavy Anti-Missile Turret"
bay "Fighter" -16 -9
engine 11 128
engine -8 128
gun -11 -125 "Sidewinder Missile Launcher"
gun 11 -125 "Sidewinder Missile Launcher"
turret -22 -53.5 "Heavy Laser Turret"
turret 19.5 -39 "Heavy Anti-Missile Turret"
turret 20 33 "Heavy Laser Turret"
turret -20.5 103.5 "Heavy Anti-Missile Turret"
bay "Fighter" -25 -25
leak "leak" 50 50
leak "flame" 80 80
leak "big leak" 80 30
Expand Down
Binary file modified images/ship/bactrian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/ship/mule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/thumbnail/bactrian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/thumbnail/mule.png
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 6687a47

Please sign in to comment.