Merge pull request #6970 from VOREStation/aro-fightermerge

Fighter rename, aro.dmm rearrange
This commit is contained in:
Aronai Sieyes
2020-03-24 15:13:46 -04:00
committed by GitHub
4 changed files with 234 additions and 111 deletions
@@ -8,7 +8,7 @@
var/stabilization_enabled = TRUE //If our anti-space-drift is on
var/ground_capable = FALSE //If we can fly over normal turfs and not just space
icon = 'icons/mecha/mecha64x64.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = ""
initial_icon = ""
@@ -152,7 +152,7 @@
/obj/mecha/combat/fighter/gunpod
name = "Gunpod"
desc = "Small mounted weapons platform capable of space and surface combat. More like a flying tank than a dedicated fightercraft."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "gunpod"
initial_icon = "gunpod"
@@ -214,7 +214,7 @@
/obj/effect/decal/mecha_wreckage/gunpod
name = "Gunpod wreckage"
desc = "Remains of some unfortunate gunpod. Completely unrepairable."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "gunpod-broken"
bound_width = 64
bound_height = 64
@@ -232,7 +232,7 @@
/obj/mecha/combat/fighter/baron
name = "Baron"
desc = "A conventional space superiority fighter, one-seater. Not capable of ground operations."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "baron"
initial_icon = "baron"
@@ -251,7 +251,7 @@
/obj/effect/decal/mecha_wreckage/baron
name = "Baron wreckage"
desc = "Remains of some unfortunate fighter. Completely unrepairable."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "baron-broken"
bound_width = 64
bound_height = 64
@@ -269,7 +269,7 @@
/obj/mecha/combat/fighter/scoralis
name = "scoralis"
desc = "An imported space fighter with integral cloaking device. Beware the power consumption, though. Not capable of ground operations."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "scoralis"
initial_icon = "scoralis"
@@ -288,7 +288,7 @@
/obj/effect/decal/mecha_wreckage/scoralis
name = "scoralis wreckage"
desc = "Remains of some unfortunate fighter. Completely unrepairable."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "scoralis-broken"
bound_width = 64
bound_height = 64
@@ -305,7 +305,7 @@
/obj/mecha/combat/fighter/allure
name = "allure"
desc = "A fighter of Zorren design, it's blocky appearance is made up for by it's stout armor and finely decorated hull paint."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "allure"
initial_icon = "allure"
@@ -325,7 +325,7 @@
/obj/effect/decal/mecha_wreckage/allure
name = "allure wreckage"
desc = "Remains of some unfortunate fighter. Completely unrepairable."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "allure-broken"
bound_width = 64
bound_height = 64
@@ -342,7 +342,7 @@
/obj/mecha/combat/fighter/pinnace
name = "pinnace"
desc = "A cramped ship's boat, capable of atmospheric and space flight. Not capable of mounting weapons. Capable of fitting one pilot and one passenger."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "pinnace"
initial_icon = "pinnace"
@@ -365,7 +365,7 @@
/obj/effect/decal/mecha_wreckage/pinnace
name = "pinnace wreckage"
desc = "Remains of some unfortunate ship's boat. Completely unrepairable."
icon = 'icons/mecha/fighters64x64_vr.dmi'
icon = 'icons/mecha/fighters64x64.dmi'
icon_state = "pinnace-broken"
bound_width = 64
bound_height = 64

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 210 KiB

+222 -99
View File
@@ -2872,20 +2872,20 @@
/area/shuttle/aroboat)
"fS" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 5
dir = 1
},
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 8
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
icon_state = "intact";
dir = 10
},
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"fT" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 9
dir = 1
},
/obj/effect/floor_decal/corner_techfloor_grid,
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"fU" = (
@@ -2970,44 +2970,24 @@
/turf/simulated/floor/reinforced,
/area/ship/aro/midshipshangars)
"ge" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/effect/floor_decal/steeldecal/steel_decals_central7{
icon_state = "steel_decals_central7";
dir = 4
},
/turf/simulated/floor/tiled/monofloor{
dir = 4
},
/area/ship/aro/midshipshangars)
"gf" = (
/obj/effect/floor_decal/techfloor/orange/corner{
icon_state = "techfloororange_corners";
dir = 4
},
/obj/effect/floor_decal/techfloor/orange/corner,
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 9
},
/obj/machinery/mech_recharger{
icon = 'icons/turf/shuttle_alien_blue.dmi'
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"gf" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"gg" = (
/obj/effect/floor_decal/techfloor/orange/corner{
icon_state = "techfloororange_corners";
dir = 1
},
/obj/effect/floor_decal/techfloor/orange/corner{
icon_state = "techfloororange_corners";
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/obj/effect/floor_decal/corner_techfloor_grid{
icon_state = "corner_techfloor_grid";
dir = 6
},
/obj/machinery/mech_recharger{
icon = 'icons/turf/shuttle_alien_blue.dmi'
},
/obj/mecha/working/hoverpod/gunpod/agile,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"gh" = (
@@ -3091,23 +3071,17 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/aroboat)
"gs" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 6
},
/obj/effect/floor_decal/corner_techfloor_grid{
/obj/machinery/atmospherics/portables_connector{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/tiled/monotile,
/area/ship/aro/midshipshangars)
"gt" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 10
},
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 4
/obj/machinery/mech_recharger{
icon = 'icons/turf/shuttle_alien_blue.dmi'
},
/obj/mecha/combat/fighter/pinnace,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"gu" = (
@@ -3362,6 +3336,7 @@
},
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/crisis_drone,
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"lD" = (
@@ -3369,8 +3344,18 @@
icon_state = "tube1";
dir = 8
},
/obj/machinery/portable_atmospherics/canister/phoron,
/obj/effect/floor_decal/industrial/danger/full,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"mU" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"tu" = (
@@ -3382,9 +3367,18 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"uZ" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"wC" = (
/obj/effect/floor_decal/industrial/outline,
/obj/machinery/mech_recharger{
icon = 'icons/turf/shuttle_alien_blue.dmi'
},
/obj/mecha/combat/fighter/pinnace,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"xu" = (
@@ -3392,27 +3386,64 @@
dir = 1
},
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon,
/obj/item/mecha_parts/mecha_equipment/cloak,
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"CW" = (
/obj/machinery/atmospherics/portables_connector{
"Bj" = (
/obj/effect/floor_decal/sign/dock/two,
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Gc" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/repair_droid,
/turf/simulated/floor/reinforced,
/area/ship/aro/midshipshangars)
"GH" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 1
},
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"GI" = (
/obj/effect/floor_decal/techfloor/orange/corner{
icon_state = "techfloororange_corners";
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"HK" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"KH" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Lp" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
icon_state = "intact";
dir = 5
},
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Md" = (
@@ -3421,12 +3452,63 @@
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/reinforced,
/area/ship/aro/midshipshangars)
"Nb" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
/turf/simulated/floor/reinforced,
/area/ship/aro/midshipshangars)
"Oo" = (
/obj/effect/floor_decal/techfloor/orange/corner,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"OZ" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 10
},
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"PJ" = (
/obj/mecha/working/hoverpod/gunpod/agile,
/obj/machinery/atmospherics/portables_connector{
/obj/effect/floor_decal/steeldecal/steel_decals_central6,
/turf/simulated/floor/tiled/monofloor{
dir = 8
},
/area/ship/aro/midshipshangars)
"QK" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 9
},
/obj/effect/floor_decal/industrial/warning/corner,
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/omni_shield/fighter64,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"QM" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 6
},
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"TR" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"TU" = (
@@ -3434,8 +3516,49 @@
icon_state = "tube1";
dir = 4
},
/obj/machinery/portable_atmospherics/canister/phoron,
/obj/effect/floor_decal/industrial/danger/full,
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Vc" = (
/obj/effect/floor_decal/techfloor/orange{
icon_state = "techfloororange_edges";
dir = 5
},
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/obj/structure/table/rack/shelf/steel,
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Wi" = (
/obj/effect/floor_decal/industrial/loading,
/turf/simulated/floor/reinforced,
/area/ship/aro/midshipshangars)
"Xd" = (
/obj/effect/floor_decal/techfloor/orange,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Xy" = (
/obj/effect/floor_decal/techfloor/orange/corner{
icon_state = "techfloororange_corners";
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
"Yy" = (
/obj/effect/floor_decal/sign/dock/one,
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
/area/ship/aro/midshipshangars)
@@ -11193,11 +11316,11 @@ ek
ek
ek
ek
fy
Gc
iU
lD
uZ
fy
mU
fy
fy
ek
@@ -11338,9 +11461,9 @@ Md
tu
Lp
PJ
uO
fy
fy
wC
Xd
Wi
fy
fP
gW
@@ -11481,10 +11604,10 @@ fy
fS
ge
gs
Xd
Wi
fy
fy
fy
fP
Yy
gW
aa
aa
@@ -11620,10 +11743,10 @@ fn
fy
fy
fy
fy
Vc
gf
fy
fy
Oo
QM
fy
fy
fP
@@ -11763,8 +11886,8 @@ fy
fy
fy
fy
gf
fy
GH
uO
fy
fy
fy
@@ -11905,8 +12028,8 @@ fy
fy
fy
fy
gf
fy
GH
uO
fy
fy
fy
@@ -12046,10 +12169,10 @@ fq
fy
fy
fy
fy
gf
fy
fy
QK
Xy
GI
OZ
fy
fy
fP
@@ -12189,12 +12312,12 @@ fy
fy
fy
fT
gg
PJ
gt
Xd
Wi
fy
fy
fy
fP
Bj
gW
aa
aa
@@ -12330,11 +12453,11 @@ ek
ek
Md
tu
Lp
CW
uO
fy
fy
KH
ge
gs
Xd
Wi
fy
fP
gW
@@ -12471,11 +12594,11 @@ ek
ek
ek
ek
fy
Nb
xu
TU
HK
fy
TR
gI
fy
ek
+1 -1
View File
@@ -908,7 +908,7 @@
#include "code\game\mecha\mecha_wreckage.dm"
#include "code\game\mecha\combat\combat.dm"
#include "code\game\mecha\combat\durand.dm"
#include "code\game\mecha\combat\fighter_vr.dm"
#include "code\game\mecha\combat\fighter.dm"
#include "code\game\mecha\combat\gorilla.dm"
#include "code\game\mecha\combat\gygax.dm"
#include "code\game\mecha\combat\marauder.dm"