diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 6aec709ea0d0..fa260f67f604 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -877,6 +877,7 @@ /obj/item/clothing/under/syndicate/cybersun/research, /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/soft/cybersun, +/obj/item/storage/belt/utility/full/engi, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/welding, /obj/effect/turf_decal/industrial/warning{ @@ -1102,7 +1103,6 @@ pixel_x = 20; pixel_y = 10 }, -/obj/machinery/firealarm/directional/east, /obj/item/clipboard{ pixel_x = -5; pixel_y = 3 @@ -1120,6 +1120,15 @@ pixel_x = 9; pixel_y = 0 }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/button/door{ + id = "kansatsu_secure_storage"; + name = "Window Access"; + dir = 8; + pixel_x = 20; + pixel_y = 1; + req_access_txt = "19" + }, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -1164,10 +1173,11 @@ }, /obj/item/clothing/under/syndicate/cybersun/officer, /obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/gloves/krav_maga/combatglovesplus, +/obj/item/pen/edagger, /turf/open/floor/plasteel/patterned/grid{ color = "#777777" }, @@ -2349,12 +2359,13 @@ }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/door/window/brigdoor/westleft{ - req_access_txt = "19" - }, /obj/structure/window/plasma/reinforced{ dir = 1 }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_secure_storage"; + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "RY" = ( diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 32a74c843b01..b1a0d89b1442 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -144,6 +144,7 @@ . = ..() can_hold = typecacheof(list( /obj/item/gun/ballistic/automatic/pistol/syndicate, + /obj/item/gun/ballistic/automatic/pistol/himehabu, /obj/item/gun/ballistic/revolver, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index f5c5fe638f26..5591b49c899a 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -210,5 +210,4 @@ new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) new /obj/item/ammo_box/a357 (src) new /obj/item/ammo_box/a357 (src) - new /obj/item/ammo_box/a357 (src) new /obj/item/folder/documents/syndicate/cybersun (src) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 1149081067a9..5d4b1f64640d 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -384,8 +384,8 @@ cost = 500 /datum/supply_pack/ammo/c22lr - name = ".22lr Ammo Box Crate" - desc = "TODO" + name = ".22 LR Ammo Box Crate" + desc = "Contains two 75 round ammo boxes for refilling .22 LR weapons." contains = list(/obj/item/ammo_box/c22lr_box, /obj/item/ammo_box/c22lr_box) crate_name = "ammo crate" diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 0255dbad94e8..7789bad2d3c0 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -532,7 +532,7 @@ head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat id = /obj/item/card/id/syndicate_command/crew_id - r_pocket = /obj/item/kitchen/knife/switchblade + r_pocket = null glasses = /obj/item/clothing/glasses/sunglasses /datum/outfit/job/syndicate/head_of_personnel/suns @@ -1200,6 +1200,7 @@ r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine + belt = null /datum/outfit/job/syndicate/engineer/suns name = "Syndicate - Ship Engineer (SUNS)"