diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm index dff70e1909a..2dbe929db7d 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm @@ -306,7 +306,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/vault) "aI" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/right, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 4 }, @@ -2433,7 +2432,6 @@ /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service) "fv" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 8 }, @@ -2996,7 +2994,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/highsecurity{ - name = "Interrogation" + name = "Arcade" }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, @@ -3733,7 +3731,6 @@ /turf/closed/wall/r_wall/plastitanium/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/engineering) "iq" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) @@ -5203,14 +5200,14 @@ }, /area/ruin/space/has_grav/bubbers/persistance/sci/xenobio) "lm" = ( -/obj/machinery/door/airlock/service{ - id_tag = "syndishipjanidorm"; - name = "Janitorial Lounge" - }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/airlock/service{ + id_tag = "syndishipjanidorm"; + name = "Janitorial Lounge" + }, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "ln" = ( @@ -9833,6 +9830,7 @@ /obj/structure/marker_beacon/burgundy{ pixel_x = 16 }, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "us" = ( @@ -10825,6 +10823,7 @@ /obj/item/clothing/gloves/latex/nitrile{ pixel_x = 21 }, +/obj/machinery/incident_display/tram/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "wt" = ( @@ -12661,9 +12660,7 @@ /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "zU" = ( /obj/structure/marker_beacon/burgundy, -/obj/machinery/suit_storage_unit/industrial/bloodredsuit{ - req_access = list("syndicate") - }, +/obj/machinery/suit_storage_unit/industrial/daimyo, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "zV" = ( @@ -12791,14 +12788,14 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/trimline/neutral/line{ color = "#1dc251"; alpha = 200; dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -13756,9 +13753,6 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/bubbers/persistance/sci/robotics) "Cf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/trimline/dark/filled/warning{ alpha = 160; dir = 10 @@ -13771,6 +13765,9 @@ alpha = 200; color = "#1dc251" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/white/smooth_corner{ dir = 4 }, @@ -14486,9 +14483,6 @@ /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "Dz" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -14501,6 +14495,9 @@ /obj/machinery/door/firedoor/heavy, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "DA" = ( @@ -14649,9 +14646,6 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/atmospherics) "DS" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -14659,6 +14653,9 @@ }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "DT" = ( @@ -15767,9 +15764,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service) "FV" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -15782,6 +15776,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "FW" = ( @@ -16257,7 +16254,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/janitorial) "Ha" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) @@ -17675,6 +17671,15 @@ "JX" = ( /obj/machinery/light/directional/east, /obj/vehicle/ridden/atv/snowmobile/syndicate, +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = 25; + name = "Blast Doors Toggle"; + req_access = list("syndicate"); + icon_state = "tram"; + pixel_y = 5; + base_icon_state = "tram" + }, /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service) "JZ" = ( @@ -17950,12 +17955,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, /obj/machinery/door/airlock/service{ id_tag = "syndishipjanidorm"; name = "Janitorial Lounge" }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "KS" = ( @@ -18900,7 +18905,6 @@ /turf/open/floor/iron/white/smooth_large, /area/ruin/space/has_grav/bubbers/persistance/sci/rnd) "MK" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "ML" = ( @@ -19992,7 +19996,6 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/bubbers/persistance/sec/brigentrance) "OZ" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 }, @@ -20358,7 +20361,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "PJ" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right, /obj/effect/turf_decal/siding/wideplating_new/dark/corner, /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/mineral/plastitanium/red, @@ -21987,6 +21989,10 @@ dir = 1 }, /area/ruin/space/has_grav/bubbers/persistance/med) +"Tw" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall/plastitanium/syndicate/cruiser, +/area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Tx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -22533,7 +22539,6 @@ /turf/open/floor/plating/reinforced, /area/ruin/space/has_grav/bubbers/persistance/engineering/gas) "UI" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, @@ -23728,7 +23733,6 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "Xf" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/holopad, @@ -28169,7 +28173,7 @@ ax ax rh pc -pc +Tw rh rh ax diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm index 2f905632bf4..461fbd27ccd 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm @@ -2488,7 +2488,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "fe" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/right, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) @@ -3963,7 +3962,6 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "ii" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/left, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 }, @@ -5204,7 +5202,6 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/sec/interrogation) "kJ" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/holopad, @@ -6499,9 +6496,6 @@ /turf/open/floor/iron/white/diagonal, /area/ruin/space/has_grav/bubbers/persistance/med) "nt" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -6514,6 +6508,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "nu" = ( @@ -7260,6 +7257,15 @@ "oX" = ( /obj/machinery/light/directional/east, /obj/vehicle/ridden/atv, +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = 25; + name = "Blast Doors Toggle"; + req_access = list("syndicate"); + icon_state = "tram"; + pixel_y = 5; + base_icon_state = "tram" + }, /turf/open/floor/iron/colony/bolts, /area/ruin/space/has_grav/bubbers/persistance/service) "oY" = ( @@ -7809,7 +7815,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/engineering/utilities) "qm" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/right, /obj/effect/turf_decal/siding/wideplating_new/dark/corner, /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/mineral/plastitanium/red, @@ -10074,9 +10079,6 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "uG" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -10089,6 +10091,9 @@ /obj/machinery/door/firedoor/heavy, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "uI" = ( @@ -10100,16 +10105,8 @@ /turf/open/floor/plating/reinforced, /area/lavaland/surface/outdoors) "uK" = ( -/obj/machinery/suit_storage_unit{ - mask_type = /obj/item/clothing/mask/gas/syndicate; - mod_type = /obj/item/mod/control/pre_equipped/traitor_elite; - storage_type = /obj/item/tank/jetpack/harness; - req_access = list("syndicate_leader") - }, /obj/structure/marker_beacon/burgundy, -/obj/machinery/suit_storage_unit/industrial/bloodredsuit{ - req_access = list("syndicate") - }, +/obj/machinery/suit_storage_unit/industrial/daimyo, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/bubbers/persistance/command/admiral) "uL" = ( @@ -10600,6 +10597,7 @@ /obj/structure/marker_beacon/burgundy{ pixel_x = 16 }, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/plating/elevatorshaft, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "vP" = ( @@ -12740,7 +12738,6 @@ /turf/open/floor/pod/dark, /area/ruin/space/has_grav/bubbers/persistance/engineering) "zT" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/middle, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) "zU" = ( @@ -13190,14 +13187,14 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service) "AV" = ( -/obj/machinery/door/airlock/service{ - id_tag = "syndishipjanidorm"; - name = "Janitorial Lounge" - }, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/door/airlock/service{ + id_tag = "syndishipjanidorm"; + name = "Janitorial Lounge" + }, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "AX" = ( @@ -16329,7 +16326,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/shower) "GU" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/middle/left, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/command/bridge) @@ -16493,6 +16489,15 @@ pixel_x = 7; pixel_y = 3 }, +/obj/machinery/button/door{ + id = "syndihanger"; + pixel_x = 25; + name = "Blast Doors Toggle"; + req_access = list("syndicate"); + icon_state = "tram"; + pixel_y = 5; + base_icon_state = "tram" + }, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/bubbers/persistance/service/kitchen) "Hs" = ( @@ -17298,7 +17303,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/ruin/space/has_grav/bubbers/persistance/med/chem) "Jg" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/right, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 4 }, @@ -18634,7 +18638,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/highsecurity{ - name = "Interrogation" + name = "Arcade" }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, @@ -19055,6 +19059,7 @@ /obj/item/clothing/gloves/latex/nitrile{ pixel_x = 21 }, +/obj/machinery/incident_display/tram/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/ruin/space/has_grav/bubbers/persistance/med/treatment) "MT" = ( @@ -22875,7 +22880,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "US" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/top/middle, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, @@ -23837,12 +23841,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, /obj/machinery/door/airlock/service{ id_tag = "syndishipjanidorm"; name = "Janitorial Lounge" }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/dorms/janitor) "WX" = ( @@ -23971,9 +23975,6 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/bubbers/persistance/engineering/mining) "Xq" = ( -/obj/machinery/door/airlock/security/old/glass{ - name = "Quarters Access" - }, /obj/effect/turf_decal/stripes/red/full, /obj/effect/mapping_helpers/airlock/cutaiwire, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -23981,6 +23982,9 @@ }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/wood/glass{ + name = "Quarters Access" + }, /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/persistance/service/lounge) "Xs" = ( @@ -24021,7 +24025,6 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/bubbers/persistance/service/hydro) "Xu" = ( -/obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left, /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 8 }, @@ -27982,7 +27985,7 @@ ZK ZK mH Ej -Ej +mH mH mH ZK diff --git a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm index 6f5536425f3..e6e4e76d8b7 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm @@ -19,3 +19,108 @@ /obj/item/melee/energy/sword, /obj/item/shield/energy, ) + +//Admiral's Unique modsuit, designed around being a Cybersun modsuit and not specifically Syndicate + +/obj/item/mod/control/pre_equipped/daimyo + theme = /datum/mod_theme/daimyo + applied_cell = /obj/item/stock_parts/power_store/cell/hyper + starting_frequency = MODLINK_FREQ_SYNDICATE + applied_modules = list( + /obj/item/mod/module/storage/syndicate, + /obj/item/mod/module/dna_lock, + /obj/item/mod/module/longfall, + /obj/item/mod/module/shock_absorber, + /obj/item/mod/module/emp_shield/advanced, + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/noslip, + /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/shove_blocker, + /obj/item/mod/module/headprotector, + /obj/item/mod/module/night, + ) + default_pins = list( + /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/dna_lock, + /obj/item/mod/module/night, + ) + +/datum/mod_theme/daimyo + name = "daimyo" + desc = "A bleeding-edge armored suit designed by Cybersun Industries in tandem with Nakamura Engineering." + extended_desc = "A strikingly unique looking up-armored MODsuit which calls back to Cybersun's long lineage, \ + the Daimyo MODsuit was designed in tandem with Nakamura Engineering's top divisions. It utilizes advanced technology\ + provided to them by a secretive Cybersun West subsidiary known only as the Invictia Research Division. \ + Created as a response to the Apocryphal MODsuit, the Daimyo MODsuit provides less overall protection \ + to lean on a more agressive approach to confrontations. Only seen worn by Cybersun Executives and \ + high ranking employees, this MODsuit symbolizes Cybersun excellence and power. This one has been modified \ + slightly to better protect the wearer from the harshness of Lavaland, where it's deployed. \ + A tag on the core reads 'This is the most expensive piece of equipment you'll ever handle in your life, \ + do NOT lose it.' -Ruggero" + default_skin = "daimyo" + armor_type = /datum/armor/mod_theme_daimyo + resistance_flags = FIRE_PROOF|ACID_PROOF|LAVA_PROOF + atom_flags = PREVENT_CONTENTS_EXPLOSION_1 + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + siemens_coefficient = 0 + complexity_max = DEFAULT_MAX_COMPLEXITY + 10 + allowed_suit_storage = list( + /obj/item/restraints/handcuffs, + /obj/item/assembly/flash, + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/shield/energy, + ) + variants = list( + "daimyo" = list( + MOD_ICON_OVERRIDE = 'modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi', + MOD_WORN_ICON_OVERRIDE = 'modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi', + /obj/item/clothing/head/mod = list( + UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS|BLOCK_GAS_SMOKE_EFFECT, + UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR, + SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT, + SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, + UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE, + SEALED_MESSAGE = HELMET_SEAL_MESSAGE, + ), + /obj/item/clothing/suit/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + SEALED_INVISIBILITY = HIDEJUMPSUIT, + UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE, + SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE, + ), + /obj/item/clothing/gloves/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE, + SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE, + ), + /obj/item/clothing/shoes/mod = list( + UNSEALED_CLOTHING = THICKMATERIAL, + SEALED_CLOTHING = STOPSPRESSUREDAMAGE, + CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE, + SEALED_MESSAGE = BOOT_SEAL_MESSAGE, + ), + ), + ) + +/datum/armor/mod_theme_daimyo + melee = 80 + bullet = 60 + laser = 50 + energy = 60 + bomb = 100 + bio = 100 + fire = 100 + acid = 100 + wound = 25 + +/datum/mod_theme/daimyo/set_skin(obj/item/mod/control/mod, skin) + . = ..() + var/parts = mod.get_parts() + for(var/obj/item/part as anything in parts + mod) + part.worn_icon_digi = 'modular_zubbers/icons/mob/clothing/modsuit/mod.dmi' diff --git a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm index 2f3b23c5e1a..aa6f94de89b 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/suitstorage.dm @@ -19,6 +19,11 @@ storage_type = /obj/item/tank/internals/emergency_oxygen/double mask_type = /obj/item/clothing/mask/gas/syndicate +/obj/machinery/suit_storage_unit/industrial/daimyo + mod_type = /obj/item/mod/control/pre_equipped/daimyo + storage_type = /obj/item/tank/internals/emergency_oxygen/double + mask_type = /obj/item/clothing/mask/gas/syndicate + /obj/machinery/suit_storage_unit/industrial/commsoperative mod_type = /obj/item/mod/control/pre_equipped/infiltrator/persistence diff --git a/modular_zubbers/icons/mob/clothing/modsuit/mod.dmi b/modular_zubbers/icons/mob/clothing/modsuit/mod.dmi index 681d49eeb6a..3888d3d9c0f 100644 Binary files a/modular_zubbers/icons/mob/clothing/modsuit/mod.dmi and b/modular_zubbers/icons/mob/clothing/modsuit/mod.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi b/modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi index 2f23e8e9a2d..12bfe06f07b 100644 Binary files a/modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi and b/modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi b/modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi index 12910fe0087..1e0485363a7 100644 Binary files a/modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi and b/modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi differ