diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index aef766be3b2..c5a485d9818 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -252,8 +252,8 @@ Deployable Kits return 1 /obj/machinery/deployable/barrier/legion - name = "legion barrier" - desc = "A deployable barrier, bearing the marks of the Tau Ceti Foreign Legion. Swipe your ID card to lock/unlock it." + name = "\improper TCAF barrier" + desc = "A deployable barrier, bearing the marks of the Tau Ceti Armed Forces. Swipe your ID card to lock/unlock it." icon_state = "barrier_legion" req_access = null req_one_access = list(ACCESS_TCAF_SHIPS, ACCESS_LEGION) @@ -283,8 +283,8 @@ Deployable Kits A.add_fingerprint(user) /obj/item/deployable_kit/legion_barrier - name = "legion barrier kit" - desc = "A quick assembly kit for deploying id-lockable barriers in the field. This one has the mark of the Tau Ceti Foreign Legion." + name = "\improper TCAF barrier kit" + desc = "A quick assembly kit for deploying id-lockable barriers in the field. This one has the mark of the Tau Ceti Armed Forces." icon = 'icons/obj/storage/briefcase.dmi' icon_state = "barrier_kit" item_state = "barrier_kit" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 2cd4ae2f817..a3a1934ad0c 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -1198,7 +1198,7 @@ check_records = 0 check_access = 1 ailock = 1 - req_one_access = list(ACCESS_LEGION) + req_one_access = list(ACCESS_LEGION, ACCESS_TCAF_SHIPS) #undef TURRET_PRIORITY_TARGET #undef TURRET_SECONDARY_TARGET diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index ee615705c88..323695b38be 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -316,8 +316,8 @@ var/active = 0 /obj/item/shield/riot/tact/legion - name = "legion ballistic shield" - desc = "A highly advanced ballistic shield crafted from durable materials and plated ablative panels. Can be collapsed for mobility. This one has been painted in the colors of the Tau Ceti Foreign Legion." + name = "\improper TCAF ballistic shield" + desc = "A highly advanced ballistic shield crafted from durable materials and plated ablative panels. Can be collapsed for mobility. This one has been painted in the colors of the Tau Ceti Armed Forces." icon_state = "legion_tactshield" item_state = "legion_tactshield" diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index e2eac4283be..87f9ad7aec3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -116,7 +116,7 @@ /obj/item/rig/retro name = "retrofitted military hardsuit control module" - desc = "An old repurposed construction exoskeleton redesigned for combat. Its colors and insignias match those of the Tau Ceti Foreign Legion." + desc = "An old repurposed construction exoskeleton redesigned for combat. Its colors and insignias match those of the Tau Ceti Armed Forces." icon = 'icons/clothing/rig/legion.dmi' icon_state = "legion_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una", "vau", "vaw") @@ -157,7 +157,7 @@ allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY /obj/item/rig/retro/equipped - req_access = list(ACCESS_LEGION) + req_one_access = list(ACCESS_TCAF_SHIPS, ACCESS_LEGION) initial_modules = list( /obj/item/rig_module/actuators, /obj/item/rig_module/device/drill, diff --git a/html/changelogs/Ben10083 - Legion Fixes.yml b/html/changelogs/Ben10083 - Legion Fixes.yml new file mode 100644 index 00000000000..62dec3abd65 --- /dev/null +++ b/html/changelogs/Ben10083 - Legion Fixes.yml @@ -0,0 +1,63 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "TCAF Corvette now has emergency shutters." + - qol: "TCAF Corvette had some items added to compensate for high ghost role count." + - bugfix: "Legion deployable turret now useable by TCAF Ghostroles." + - bugfix: "Wiring fixes to TCAF Corvette." + - spellcheck: "Legion ballistic shield renamed to TCAF Ballistic Shield, description changed as well." + - spellcheck: "Retro hardsuit rig now referrences TCAF instead of TCFL, and added TCAF ship access (was meant to be added in the past)." diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 92f9016a5ca..9b73d96e28f 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -16,6 +16,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/captain) "aD" = ( @@ -26,6 +29,9 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "aF" = ( @@ -46,6 +52,9 @@ dir = 10 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "aR" = ( @@ -229,13 +238,13 @@ /area/tcaf_corvette/francisca) "cB" = ( /obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/portables_connector{ dir = 8; layer = 2.8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -390,6 +399,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/francisca) "dn" = ( @@ -398,11 +410,19 @@ }, /obj/structure/closet/cabinet, /obj/item/clothing/shoes/jackboots, -/obj/item/material/twohanded/pike/flag, /obj/item/clothing/accessory/legion, /obj/item/device/megaphone/command, /obj/item/clothing/under/legion/tcaf, /obj/item/clothing/head/beret/legion/tcaf/tcaf_field, +/obj/item/flag/biesel, +/obj/item/flag/biesel, +/obj/item/flag/biesel/l, +/obj/item/flag/biesel/l, +/obj/item/rig/retro/equipped{ + req_access = list(204); + req_one_access = null + }, +/obj/item/material/twohanded/pike/flag, /turf/simulated/floor/carpet/lightblue, /area/tcaf_corvette/captain) "dp" = ( @@ -495,6 +515,9 @@ req_access = list(204); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/medical) "dS" = ( @@ -542,6 +565,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/francisca) "et" = ( @@ -560,6 +586,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/dock) "eu" = ( @@ -618,6 +648,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/bridge) "eL" = ( @@ -695,6 +728,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/grauwolf) "ft" = ( @@ -792,6 +828,10 @@ name = "Security"; req_access = list(204) }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 8; + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/security) "ge" = ( @@ -821,6 +861,7 @@ /obj/item/stack/material/lead/full{ pixel_y = 3 }, +/obj/item/device/robotanalyzer, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/engineering) "gh" = ( @@ -918,6 +959,9 @@ name = "Armory"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/storage) "gT" = ( @@ -1240,6 +1284,10 @@ name = "Reactor"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/engineering) "jB" = ( @@ -1316,6 +1364,9 @@ name = "Armory"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/storage) "ko" = ( @@ -1488,6 +1539,9 @@ }, /obj/item/storage/belt/security/full, /obj/item/storage/belt/security/full, +/obj/item/storage/belt/security/full, +/obj/item/storage/belt/security/full, +/obj/item/storage/belt/security/full, /obj/item/gun/energy/taser, /obj/item/gun/energy/taser, /obj/item/grenade/flashbang, @@ -1711,6 +1765,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/security) "og" = ( @@ -1761,6 +1819,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/captain) "oA" = ( @@ -2062,6 +2123,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/shuttle/tcaf) "rh" = ( @@ -2102,6 +2166,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/messhall) "rK" = ( @@ -2188,12 +2256,18 @@ name = "Operating Theatre 1"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) "sy" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized{ id = "tcafsurgery2" }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/medical) "sB" = ( @@ -2273,6 +2347,7 @@ /obj/item/clothing/accessory/storage/chestpouch, /obj/item/clothing/accessory/storage/chestpouch, /obj/item/clothing/accessory/tcaf_senior_legion_pauldron, +/obj/item/shield/riot/tact/legion, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/armory) "sN" = ( @@ -2418,6 +2493,10 @@ /area/tcaf_corvette/hangar) "ug" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/reinforced, /area/tcaf_corvette/engineering) "ul" = ( @@ -2521,6 +2600,11 @@ }, /turf/simulated/wall/shuttle/legion, /area/tcaf_corvette/engineering) +"uN" = ( +/obj/structure/table/steel, +/obj/item/lore_radio, +/turf/simulated/floor/tiled/dark, +/area/tcaf_corvette/messhall) "uO" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -2556,6 +2640,10 @@ opacity = 0 }, /obj/structure/grille, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/bridge) "vb" = ( @@ -2679,6 +2767,9 @@ name = "Operating Theatre 2"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/white, /area/tcaf_corvette/medical) "wq" = ( @@ -2693,6 +2784,10 @@ /area/tcaf_corvette/captain) "wx" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "wy" = ( @@ -2809,6 +2904,9 @@ opacity = 0 }, /obj/structure/grille, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/bridge) "xk" = ( @@ -2886,6 +2984,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/messhall) "yx" = ( @@ -3206,6 +3307,9 @@ name = "Commanding Officer's Quarters"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/wood/walnut, /area/tcaf_corvette/captain) "Bo" = ( @@ -3323,6 +3427,10 @@ name = "Medical Bay"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/medical) "CE" = ( @@ -3373,6 +3481,9 @@ req_access = list(204); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/crew) "CM" = ( @@ -3402,7 +3513,6 @@ /obj/item/clothing/head/helmet/pilot/legion{ name = "tau ceti flight helmet" }, -/obj/item/stamp/biesel, /obj/item/gun/energy/blaster/pilot_special, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/bridge) @@ -3486,6 +3596,9 @@ name = "EVA Storage"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/grauwolf) "Ek" = ( @@ -3498,6 +3611,9 @@ "El" = ( /obj/structure/table/rack, /obj/machinery/light, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, /turf/simulated/floor/shuttle/tan, /area/shuttle/tcaf) "Eo" = ( @@ -3539,6 +3655,9 @@ req_access = list(204); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/thruststarb) "EF" = ( @@ -3553,6 +3672,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/security) "ER" = ( @@ -3717,6 +3840,9 @@ /obj/effect/map_effect/window_spawner/full/reinforced/polarized{ id = "tcafsurgery1" }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark/full, /area/tcaf_corvette/medical) "Gh" = ( @@ -3816,6 +3942,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/hangar) "GX" = ( @@ -3892,6 +4022,9 @@ req_access = list(204); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/grauwolf) "HU" = ( @@ -4025,6 +4158,10 @@ name = "Commanding Officer"; req_access = list(204) }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 8; + req_one_access = list(204,111) + }, /turf/simulated/floor/shuttle/tan, /area/tcaf_corvette/captain) "IZ" = ( @@ -4134,6 +4271,21 @@ }, /turf/simulated/floor/lino, /area/tcaf_corvette/messhall) +"Kj" = ( +/obj/structure/window/shuttle/legion, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tcaf_bridge"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, +/turf/simulated/floor/plating, +/area/tcaf_corvette/bridge) "Kk" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -4228,6 +4380,23 @@ }, /turf/simulated/floor/plating, /area/tcaf_corvette/thruststarb) +"KS" = ( +/obj/structure/window/shuttle/legion, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "tcaf_captain"; + name = "Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, +/turf/simulated/floor/plating, +/area/tcaf_corvette/captain) "KV" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 @@ -4509,6 +4678,9 @@ req_access = list(204); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/thrustport) "MZ" = ( @@ -4551,6 +4723,9 @@ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/messhall) "Ni" = ( @@ -4575,6 +4750,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette) "Nr" = ( @@ -4659,6 +4838,10 @@ name = "Crew Quarters"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/grauwolf) "NZ" = ( @@ -5030,6 +5213,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "Ru" = ( @@ -5059,6 +5245,9 @@ "RB" = ( /obj/structure/window/shuttle/legion, /obj/structure/grille, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/shuttle/tcaf) "RC" = ( @@ -5103,6 +5292,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/messhall) "RS" = ( @@ -5189,6 +5381,10 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/bridge) "SG" = ( @@ -5448,6 +5644,10 @@ pixel_y = 5 }, /obj/item/pen/fountain/captain, +/obj/item/stamp/biesel{ + pixel_x = -4; + pixel_y = 8 + }, /turf/simulated/floor/carpet/lightblue, /area/tcaf_corvette/captain) "Vy" = ( @@ -5504,6 +5704,9 @@ id = "tcaf_cic"; name = "CIC Blast Door" }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/cic) "VN" = ( @@ -5607,6 +5810,13 @@ req_access = list(204); dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "WB" = ( @@ -5638,6 +5848,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/francisca) "WL" = ( @@ -5836,6 +6050,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/engineering) "Yk" = ( @@ -5845,6 +6063,10 @@ req_access = list(204); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/tiled/dark, /area/tcaf_corvette/thruststarb) "Yp" = ( @@ -5935,6 +6157,9 @@ /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/bridge) "YM" = ( @@ -5955,6 +6180,9 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/shuttle/tcaf) "YS" = ( @@ -5968,6 +6196,10 @@ name = "Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(204,111) + }, /turf/simulated/floor/plating, /area/tcaf_corvette/francisca) "YX" = ( @@ -6016,6 +6248,9 @@ name = "Cockpit"; req_access = list(204) }, +/obj/machinery/door/firedoor{ + req_one_access = list(204,111) + }, /turf/simulated/floor/shuttle/black, /area/shuttle/tcaf) "Zq" = ( @@ -31110,7 +31345,7 @@ Jp gr dn Jp -ai +KS ai UI UI @@ -31881,7 +32116,7 @@ Jp Jp Jp Jp -ai +KS ai UI UI @@ -34451,7 +34686,7 @@ uu NZ On SC -SC +Kj UI UI UI @@ -34708,7 +34943,7 @@ ti Qm PQ Ng -SC +Kj xc UI UI @@ -36250,7 +36485,7 @@ sN Qm uq WL -SC +Kj xc UI UI @@ -36507,7 +36742,7 @@ Nb rQ Vr SC -SC +Kj UI UI UI @@ -38298,7 +38533,7 @@ BI BK vE zN -zN +uN zN RO UI diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm index b1d1db980c7..e3bafead6ad 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm @@ -66,7 +66,7 @@ /obj/outfit/admin/tcaf_crewman/nco accessory = /obj/item/clothing/accessory/legion - backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/clothing/accessory/tcaf_prefect_pauldron = 1) + backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/shield/energy/legion = 1, /obj/item/clothing/accessory/tcaf_prefect_pauldron = 1) /datum/ghostspawner/human/tcaf_crewman/officer name = "Republican Fleet Officer"