talon, vb, and typhon fixes

This commit is contained in:
Killian
2022-10-12 13:25:58 +01:00
parent 3bc9414f49
commit 33efd08ddb
8 changed files with 128 additions and 61 deletions
@@ -190,6 +190,12 @@
icon_state = "techtile_grid"
no_variants = FALSE
/obj/item/stack/tile/floor/techmaint
name = "maint techfloor tile"
singular_name = "maint techfloor tile"
icon_state = "techtile_maint"
no_variants = FALSE
/obj/item/stack/tile/floor/steel_dirty
name = "steel floor tile"
singular_name = "steel floor tile"
+13 -1
View File
@@ -13,7 +13,9 @@
var/static/plating_colors = list(
/obj/item/stack/tile/floor = "#858a8f",
/obj/item/stack/tile/floor/dark = "#4f4f4f",
/obj/item/stack/tile/floor/white = "#e8e8e8")
/obj/item/stack/tile/floor/white = "#e8e8e8",
/obj/item/stack/tile/floor/techmaint = "#4d585b",
/obj/item/stack/tile/floor/techgrey = "#363f43")
var/health = 100
var/maxhealth = 100
@@ -189,3 +191,13 @@
icon_state = "catwalk_platedwhite"
tile = /obj/item/stack/tile/floor/white
platecolor = "#e8e8e8"
/obj/effect/catwalk_plated/techmaint
icon_state = "catwalk_techmaint"
tile = /obj/item/stack/tile/floor/techmaint
platecolor = "#4d585b"
/obj/effect/catwalk_plated/techfloor
icon_state = "catwalk_techfloor"
tile = /obj/item/stack/tile/floor/techgrey
platecolor = "#363f43"
+1
View File
@@ -407,6 +407,7 @@ var/list/flooring_types
/decl/flooring/tiling/new_tile/techmaint
icon_base = "techmaint"
build_type = /obj/item/stack/tile/floor/techmaint
/decl/flooring/tiling/new_tile/monofloor
icon_base = "monofloor"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

+81 -29
View File
@@ -1268,7 +1268,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/dark,
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"dw" = (
@@ -1581,6 +1581,7 @@
/area/talon_v2/central_hallway/fore)
"eC" = (
/obj/structure/closet/walllocker_double/hydrant/west,
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon_v2/engineering/star_store)
"eD" = (
@@ -1874,7 +1875,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/dark,
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"fi" = (
@@ -1984,6 +1985,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/cap_room)
"fA" = (
@@ -2217,7 +2219,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated/dark,
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"gu" = (
@@ -3397,7 +3399,7 @@
d2 = 8;
icon_state = "1-8"
},
/obj/effect/catwalk_plated/dark,
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/shuttle/talonboat)
"kw" = (
@@ -3483,7 +3485,7 @@
dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/effect/catwalk_plated/dark,
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/shuttle/talonboat)
"kJ" = (
@@ -4233,11 +4235,11 @@
"nn" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"no" = (
@@ -4702,6 +4704,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/workroom)
"oP" = (
/obj/structure/table/rack/shelf/steel,
/obj/random/maintenance/cargo,
/obj/random/maintenance/cargo,
/obj/item/weapon/storage/box/lights/mixed,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/gen_store)
"oS" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -5609,9 +5618,6 @@
/turf/simulated/floor/plating,
/area/talon_v2/engineering/port_store)
"rQ" = (
/obj/machinery/light/small{
dir = 1
},
/obj/structure/toilet,
/turf/simulated/floor/tiled/white,
/area/talon_v2/crew_quarters/restrooms)
@@ -5726,10 +5732,10 @@
d2 = 4;
icon_state = "1-4"
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/brig)
"sk" = (
@@ -5802,10 +5808,10 @@
d2 = 8;
icon_state = "4-8"
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"ss" = (
@@ -6048,11 +6054,11 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/star)
"tb" = (
@@ -6449,6 +6455,22 @@
"up" = (
/turf/simulated/wall/rshull,
/area/talon_v2/anomaly_storage)
"uq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 1
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/fore)
"uu" = (
/obj/structure/hull_corner/long_vert{
dir = 9
@@ -6904,6 +6926,9 @@
dir = 10
},
/obj/structure/catwalk,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
/area/talon_v2/engineering/atmospherics)
"vR" = (
@@ -7940,6 +7965,9 @@
/obj/machinery/disposal/wall{
dir = 8
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/med_room)
"zv" = (
@@ -8006,6 +8034,9 @@
/obj/machinery/disposal/wall{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/sec_room)
"zI" = (
@@ -8298,11 +8329,11 @@
d2 = 8;
icon_state = "2-8"
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"AQ" = (
@@ -8660,6 +8691,9 @@
/obj/item/device/radio/off{
channels = list("Talon" = 1)
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/pilot_room)
"Cf" = (
@@ -8714,7 +8748,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
@@ -8722,6 +8755,7 @@
/obj/structure/sign/directions/engineering/atmospherics{
pixel_x = -32
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"CB" = (
@@ -9204,6 +9238,15 @@
},
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/pilot_room)
"Em" = (
/obj/structure/disposalpipe/segment{
dir = 1
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
/area/talon_v2/central_hallway/fore)
"En" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -9511,12 +9554,12 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/star)
"Ff" = (
@@ -9899,7 +9942,6 @@
"Gm" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -9908,6 +9950,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/port)
"Gn" = (
@@ -10430,7 +10473,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/junction,
/obj/structure/sign/directions/engineering{
pixel_x = 32;
@@ -10451,6 +10493,7 @@
d2 = 8;
icon_state = "2-8"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"HN" = (
@@ -10482,7 +10525,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/junction{
dir = 2;
icon_state = "pipe-j2"
@@ -10497,6 +10539,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway)
"HU" = (
@@ -10945,7 +10988,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"IY" = (
@@ -11169,6 +11212,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/machinery/light/small,
/turf/simulated/floor/tiled/white,
/area/talon_v2/crew_quarters/restrooms)
"JJ" = (
@@ -11962,13 +12006,13 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/sign/department/medbay{
pixel_y = 32
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/star)
"LV" = (
@@ -12420,6 +12464,9 @@
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/structure/closet/walllocker_double/survival/south,
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"Nw" = (
@@ -12443,13 +12490,15 @@
/area/shuttle/talonboat)
"NB" = (
/obj/structure/closet/walllocker_double/south,
/obj/machinery/light,
/obj/item/weapon/extinguisher,
/obj/item/stack/cable_coil/green,
/obj/item/stack/cable_coil/green,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/structure/handrail{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"NC" = (
@@ -12527,6 +12576,9 @@
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/structure/closet/walllocker_double/survival/south,
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/talonboat)
"NO" = (
@@ -14471,7 +14523,6 @@
"TW" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -14485,6 +14536,7 @@
dir = 4;
icon_state = "pipe-c"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/port)
"TX" = (
@@ -14858,7 +14910,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -14867,6 +14918,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/port)
"Vh" = (
@@ -15577,7 +15629,6 @@
d2 = 8;
icon_state = "2-8"
},
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
@@ -15587,6 +15638,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/fore)
"Xo" = (
@@ -15734,10 +15786,10 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/effect/catwalk_plated,
/obj/structure/disposalpipe/junction{
dir = 8
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/talon_v2/central_hallway/star)
"XS" = (
@@ -22945,7 +22997,7 @@ xL
LL
xB
OQ
LT
oP
kk
LT
OQ
@@ -25749,7 +25801,7 @@ ZC
WL
yt
EN
Rs
dT
Pe
pb
Xy
@@ -25914,7 +25966,7 @@ lr
lZ
SQ
Xn
mc
uq
mc
mk
an
@@ -26766,7 +26818,7 @@ tj
mk
ru
sD
DG
Em
DG
qb
Fd
+11 -11
View File
@@ -2494,7 +2494,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/barracks)
"nl" = (
@@ -4610,12 +4610,12 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/engineering)
"yX" = (
@@ -4723,12 +4723,12 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/effect/catwalk_plated,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/hallways)
"zB" = (
@@ -6832,7 +6832,7 @@
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/weapon/storage/box/empshells/large,
/obj/item/ammo_magazine/ammo_box/b12g/emp,
/obj/item/ammo_magazine/ammo_box/b12g/flash,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
@@ -6983,7 +6983,7 @@
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/weapon/storage/box/empshells/large,
/obj/item/ammo_magazine/ammo_box/b12g/emp,
/obj/item/ammo_magazine/ammo_box/b12g/flash,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
@@ -7205,7 +7205,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/effect/catwalk_plated/dark,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
@@ -7221,6 +7220,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/effect/catwalk_plated/techfloor,
/turf/simulated/floor/plating,
/area/ship/ert/engine)
"NI" = (
@@ -7457,7 +7457,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/bridge)
"OA" = (
@@ -7497,7 +7497,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/bridge)
"OF" = (
@@ -7784,7 +7784,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/effect/catwalk_plated,
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/eng_storage)
"PG" = (
@@ -8108,12 +8108,12 @@
"Sp" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/catwalk_plated,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/med)
"Sr" = (
@@ -8884,10 +8884,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/catwalk_plated,
/obj/effect/landmark{
name = "Commando"
},
/obj/effect/catwalk_plated/techmaint,
/turf/simulated/floor/plating,
/area/ship/ert/barracks)
"WZ" = (
+16 -20
View File
@@ -7549,10 +7549,6 @@
/obj/item/clothing/accessory/armor/armguards/green,
/obj/item/clothing/accessory/armor/armguards/green,
/obj/item/clothing/accessory/armor/armguards/green,
/obj/item/clothing/accessory/armor/tag/saare,
/obj/item/clothing/accessory/armor/tag/saare,
/obj/item/clothing/accessory/armor/tag/saare,
/obj/item/clothing/accessory/armor/tag/saare,
/obj/item/clothing/accessory/armor/armorplate/tactical,
/obj/item/clothing/accessory/armor/armorplate/tactical,
/obj/item/clothing/accessory/armor/armorplate/tactical,
@@ -11168,22 +11164,22 @@
/obj/item/weapon/gun/projectile/automatic/bullpup{
pixel_y = -6
},
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/obj/item/ammo_magazine/m762/ext,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_as)
"Vx" = (