Merge pull request #11283 from VOREStation/Arokha/gunprops

Add some ship gun props from TGMC
This commit is contained in:
Aronai Sieyes
2021-07-28 12:22:35 -04:00
committed by GitHub
6 changed files with 359 additions and 20 deletions
+265
View File
@@ -105,6 +105,30 @@
icon = 'icons/obj/structures/decor.dmi'
icon_state = "stump"
// minirocket pod from TGMC
/obj/structure/prop/minirocket_pod
icon = 'icons/obj/structures/decor.dmi'
icon_state = "minirocket_pod"
// warheads from TGMC
/obj/structure/prop/warhead1
icon = 'icons/obj/structures/decor.dmi'
icon_state = "ob_warhead_1"
/obj/structure/prop/warhead2
icon = 'icons/obj/structures/decor.dmi'
icon_state = "ob_warhead_2"
/obj/structure/prop/warhead3
icon = 'icons/obj/structures/decor.dmi'
icon_state = "ob_warhead_3"
/obj/structure/prop/warhead4
icon = 'icons/obj/structures/decor.dmi'
icon_state = "ob_warhead_4"
// sentry console from TGMC
/obj/structure/prop/sentry_control
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_sentry"
// vatgrowing thing from /tg/
/obj/structure/prop/green_egg
icon = 'icons/obj/structures/decor.dmi'
@@ -122,6 +146,30 @@
bound_width = 64
bound_height = 64
// various weapons from TGMC
/obj/structure/prop/tgmc_missile
name = "missile"
desc = "It seems to be some sort of spacecraft-tier ordinance."
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "single"
bound_width = 64
/obj/structure/prop/tgmc_missile/double
icon_state = "widowmaker"
/obj/structure/prop/tgmc_missile/banshee
icon_state = "banshee"
/obj/structure/prop/tgmc_missile/keeper
icon_state = "keeper"
/obj/structure/prop/tgmc_missile/fatty
icon_state = "fatty"
/obj/structure/prop/tgmc_missile/napalm
icon_state = "napalm"
// ship memorial from TGMC
/obj/structure/prop/memorial
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "ship_memorial"
bound_width = 64
// dna vault from /tg/
/obj/structure/prop/dna_vault
icon = 'icons/obj/structures/decor96x96.dmi'
@@ -257,6 +305,118 @@
/obj/structure/prop/dominator/purple
icon_state = "dominator-purple"
/**
* Possible 'state' options for change_state(state) are:
* empty, single, banshee, keeper, fatty, napalm
*/
// ship weapons from TGMC
/obj/structure/prop/tgmc_missile_rack
name = "missile launcher"
desc = "Some sort of spacecraft-tier missile weapon."
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "rocket_pod"
bound_height = 64
/obj/structure/prop/tgmc_missile_rack/change_state(state)
. = ..()
switch(state)
if("empty")
icon_state = "rocket_pod"
if("single")
icon_state = "rocket_pod_loaded"
if("banshee")
icon_state = "rocket_pod_loadedb"
if("keeper")
icon_state = "rocket_pod_loadedk"
if("fatty")
icon_state = "rocket_pod_loadedf"
if("napalm")
icon_state = "rocket_pod_loadedn"
/obj/structure/prop/tgmc_missile_rack/single
icon_state = "rocket_pod_loaded"
/obj/structure/prop/tgmc_missile_rack/banshee
icon_state = "rocket_pod_loadedb"
/obj/structure/prop/tgmc_missile_rack/keeper
icon_state = "rocket_pod_loadedk"
/obj/structure/prop/tgmc_missile_rack/fatty
icon_state = "rocket_pod_loadedf"
/obj/structure/prop/tgmc_missile_rack/napalm
icon_state = "rocket_pod_loadedn"
/**
* Possible 'state' options for change_state(state) are:
* empty, loaded
*/
// ship weapons from TGMC
/obj/structure/prop/tgmc_minirockets
name = "rocket pod"
desc = "Some sort of spacecraft-tier rocket weapon."
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "minirocket_pod"
bound_height = 64
/obj/structure/prop/tgmc_minirockets/change_state(state)
. = ..()
switch(state)
if("empty")
icon_state = "minirocket_pod"
if("loaded")
icon_state = "minirocket_pod_loaded"
/obj/structure/prop/tgmc_minirockets/loaded
icon_state = "minirocket_pod_loaded"
/**
* Possible 'state' options for change_state(state) are:
* empty, loaded
*/
// ship weapons from TGMC
/obj/structure/prop/tgmc_laser
name = "laser cannon"
desc = "Some sort of spacecraft-tier energy weapon."
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "laser_beam"
bound_height = 64
/obj/structure/prop/tgmc_laser/change_state(state)
. = ..()
switch(state)
if("empty")
icon_state = "laser_beam"
if("loaded")
icon_state = "laser_beam_loaded"
/obj/structure/prop/tgmc_laser/loaded
icon_state = "laser_beam_loaded"
/**
* Possible 'state' options for change_state(state) are:
* empty, loaded, loadedempty
*/
// ship weapons from TGMC
/obj/structure/prop/tgmc_30mm
name = "30mm cannon"
desc = "Some sort of spacecraft-tier rotary cannon weapon."
icon = 'icons/obj/structures/decor64x64.dmi'
icon_state = "30mm_cannon"
bound_height = 64
/obj/structure/prop/tgmc_30mm/change_state(state)
. = ..()
switch(state)
if("empty")
icon_state = "30mm_cannon"
if("loaded")
icon_state = "30mm_cannon_loaded1"
if("loadedempty")
icon_state = "30mm_cannon_loaded0"
/obj/structure/prop/tgmc_30mm/loaded
icon_state = "30mm_cannon_loaded1"
/obj/structure/prop/tgmc_30mm/loadedempty
icon_state = "30mm_cannon_loaded0"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
@@ -596,6 +756,111 @@
/obj/structure/prop/nt_cruciforge/starts_working
icon_state = "nt_cruciforge_work"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
* on: Showing a display/powered up
*/
// A console from TGMC
/obj/structure/prop/tgmc_console1
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_console1"
/obj/structure/prop/tgmc_console1/change_state(state)
. = ..()
switch(state)
if("off")
icon_state = "tgmc_console1"
if("on")
icon_state = "tgmc_console1_on"
/obj/structure/prop/tgmc_console1/starts_on
icon_state = "tgmc_console1_on"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
* on: Showing a display/powered up
*/
// A console from TGMC
/obj/structure/prop/tgmc_console2
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_console2"
/obj/structure/prop/tgmc_console2/change_state(state)
. = ..()
switch(state)
if("off")
icon_state = "tgmc_console2"
if("on")
icon_state = "tgmc_console2_on"
/obj/structure/prop/tgmc_console2/starts_on
icon_state = "tgmc_console2_on"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
* on: Showing a display/powered up
*/
// A console from TGMC
/obj/structure/prop/tgmc_console3
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_console3"
/obj/structure/prop/tgmc_console3/change_state(state)
. = ..()
switch(state)
if("off")
icon_state = "tgmc_console3"
if("on")
icon_state = "tgmc_console3_on"
/obj/structure/prop/tgmc_console3/starts_on
icon_state = "tgmc_console3_on"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
* on: Showing a display/powered up
*/
// A console from TGMC
/obj/structure/prop/tgmc_console4
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_console4"
/obj/structure/prop/tgmc_console4/change_state(state)
. = ..()
switch(state)
if("off")
icon_state = "tgmc_console4"
if("on")
icon_state = "tgmc_console4_on"
/obj/structure/prop/tgmc_console4/starts_on
icon_state = "tgmc_console4_on"
/**
* Possible 'state' options for change_state(state) are:
* off: Default, boring
* on: Showing a display/powered up
*/
// A console from TGMC
/obj/structure/prop/tgmc_console5
icon = 'icons/obj/structures/decor.dmi'
icon_state = "tgmc_console5"
/obj/structure/prop/tgmc_console5/change_state(state)
. = ..()
switch(state)
if("off")
icon_state = "tgmc_console5"
if("on")
icon_state = "tgmc_console5_on"
/obj/structure/prop/tgmc_console5/starts_on
icon_state = "tgmc_console5_on"
/**
* This one is a bit more fancy than others. Anything in the contents (PLEASE LIMIT TO ONE THING)
* will show up inside it! Also if you map in an item on it, it will grab that at mapload and start
+1 -1
View File
@@ -296,7 +296,7 @@
var/turf/simulated/wall/T
for(var/direction in get_dirs_to_test())
T = get_step(src, direction)
if(!istype(T))
if(!istype(T) || T.material?.icon_base != "hull")
continue
name = T.name
Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 39 KiB

+93 -19
View File
@@ -1934,6 +1934,7 @@
/obj/effect/floor_decal/milspec/color/orange/half{
dir = 6
},
/obj/machinery/light,
/turf/simulated/floor/tiled/milspec,
/area/aro3/atmos)
"lI" = (
@@ -1948,6 +1949,13 @@
},
/turf/simulated/floor/tiled/milspec,
/area/aro3/hallway_port)
"lJ" = (
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 5
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"lM" = (
/obj/effect/floor_decal/milspec/color/white/half,
/obj/effect/floor_decal/milspec/color/white/corner{
@@ -2314,6 +2322,12 @@
/obj/effect/floor_decal/milspec_sterile/green/half,
/turf/simulated/floor/tiled/milspec/sterile,
/area/aro3/medical)
"ot" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"ou" = (
/obj/effect/floor_decal/milspec/stripe{
dir = 4
@@ -2553,6 +2567,10 @@
/obj/effect/floor_decal/milspec_sterile/green/corner,
/turf/simulated/floor/tiled/milspec/sterile,
/area/aro3/medical)
"pO" = (
/obj/effect/floor_decal/milspec/hatchmarks,
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"pP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3017,6 +3035,14 @@
},
/turf/simulated/floor/tiled/milspec,
/area/aro3/hallway_starboard)
"sX" = (
/obj/structure/prop/tgmc_minirockets,
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 6
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"td" = (
/obj/effect/floor_decal/milspec_sterile/green/half{
dir = 4
@@ -4159,6 +4185,10 @@
},
/turf/simulated/floor/tiled/eris/steel/panels,
/area/aro3/eva_hall)
"Ab" = (
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"Ac" = (
/obj/structure/closet/crate/bin{
anchored = 1;
@@ -5093,6 +5123,14 @@
/obj/item/weapon/storage/firstaid/adv,
/turf/simulated/floor/tiled/techmaint,
/area/aro3/medical)
"Hb" = (
/obj/structure/prop/tgmc_minirockets,
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 10
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"Hc" = (
/obj/effect/floor_decal/milspec/color/red/half{
dir = 9
@@ -5235,6 +5273,14 @@
},
/turf/simulated/floor/tiled/milspec,
/area/aro3/atmos)
"Im" = (
/obj/structure/prop/tgmc_laser/loaded,
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 6
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"Io" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -5977,7 +6023,7 @@
/turf/simulated/wall/tgmc/durawall,
/area/aro3/repair_bay)
"NF" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/effect/floor_decal/milspec/hatchmarks,
/turf/simulated/floor/tiled/milspec,
/area/aro3/workshop)
"NG" = (
@@ -6172,6 +6218,14 @@
},
/turf/simulated/floor/plating/eris/under,
/area/aro3/atmos)
"OM" = (
/obj/structure/prop/tgmc_laser/loaded,
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 10
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"ON" = (
/obj/structure/table/steel,
/obj/item/weapon/storage/toolbox/electrical,
@@ -6226,6 +6280,13 @@
/obj/effect/floor_decal/milspec/monotile,
/turf/simulated/floor/tiled/milspec,
/area/aro3/surfluid)
"Pa" = (
/obj/effect/floor_decal/milspec/color/red/half{
dir = 9
},
/obj/structure/prop/tgmc_missile/double,
/turf/simulated/floor/tiled/milspec,
/area/aro3/flight_deck)
"Pb" = (
/obj/machinery/light{
dir = 1
@@ -6359,6 +6420,11 @@
},
/turf/simulated/floor/tiled/milspec,
/area/aro3/power)
"Qd" = (
/obj/structure/prop/tgmc_minirockets,
/obj/effect/floor_decal/milspec/hatchmarks,
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"Qe" = (
/obj/effect/floor_decal/milspec/hatchmarks,
/turf/simulated/floor/tiled/milspec,
@@ -6392,6 +6458,7 @@
/obj/effect/floor_decal/milspec/color/red/half{
dir = 10
},
/obj/structure/prop/tgmc_missile/fatty,
/turf/simulated/floor/tiled/milspec,
/area/aro3/flight_deck)
"QB" = (
@@ -6805,8 +6872,8 @@
/turf/space,
/area/space)
"TM" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/light,
/obj/effect/floor_decal/milspec/hatchmarks,
/turf/simulated/floor/tiled/milspec,
/area/aro3/workshop)
"TN" = (
@@ -6933,6 +7000,13 @@
},
/turf/simulated/floor/tiled/milspec,
/area/aro3/eva_hall)
"UL" = (
/obj/effect/floor_decal/milspec/hatchmarks,
/obj/effect/floor_decal/industrial/warning/dust{
dir = 9
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/space)
"UM" = (
/turf/simulated/wall/tgmc/durawall/deco1,
/area/aro3/atmos)
@@ -11400,8 +11474,8 @@ Ua
Ua
Ua
Ua
hD
hD
pO
Qd
tp
Ua
Ua
@@ -15499,8 +15573,8 @@ Ua
Ua
Ua
yn
hD
hD
UL
Hb
hD
hD
hD
@@ -15641,8 +15715,8 @@ Ua
Ua
Ua
yn
hD
hD
ot
Ab
hD
hD
hD
@@ -15783,8 +15857,8 @@ Ua
Ua
Ua
yn
hD
hD
lJ
Im
hD
hD
hD
@@ -16961,7 +17035,7 @@ NC
Ty
To
Iq
Hc
Pa
QA
HE
HE
@@ -19333,8 +19407,8 @@ Ua
Ua
Ua
yn
hD
hD
UL
OM
hD
hD
hD
@@ -19475,8 +19549,8 @@ Ua
Ua
Ua
yn
hD
hD
ot
Ab
hD
hD
hD
@@ -19617,8 +19691,8 @@ Ua
Ua
Ua
yn
hD
hD
lJ
sX
hD
hD
hD
@@ -23754,8 +23828,8 @@ Ua
Ua
Ua
Ua
hD
hD
pO
Qd
AA
Ua
Ua