From e738ffa3707fd94346f5e42071039f4d30cd37c5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 28 Sep 2020 18:11:08 +0200 Subject: [PATCH] [MIRROR] Fixes for Syndicate Forgotten Ship (#1025) * Fixes for Syndicate Forgotten Ship (#53832) * Fixes missing implant on Syndicate Ship Captain: Syndicate Ship Crew Members have their implants. There are 2 boxes of syndicate firing pins in captains locker, but captain can't use them. This change fixes that. Captain had implant initially, but it was removed accidentally in #50597 Fixes spare magazines spawned in lockers: Captain has 2 mags for APS instead of 9mm mags in their locker. Crewmembers have 9mm mags instead of 10mm mags. 10mm ammoboxes replaced with 9mm. Why do we even have 10mm mags, if crew spawns with makarov and captain spawns with APS. * Fixes for Syndicate Forgotten Ship Co-authored-by: antropod --- _maps/RandomRuins/SpaceRuins/forgottenship.dmm | 12 ++++++------ code/game/objects/structures/ghost_role_spawners.dm | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index e32ae3f31b2..afcbcf9ac26 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -493,8 +493,8 @@ secure = 1 }, /obj/item/crowbar/red, -/obj/item/ammo_box/magazine/m9mm, -/obj/item/ammo_box/magazine/m9mm, +/obj/item/ammo_box/magazine/m9mm_aps, +/obj/item/ammo_box/magazine/m9mm_aps, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/syndicate_forgotten_ship) "bx" = ( @@ -690,8 +690,8 @@ secure = 1 }, /obj/item/crowbar/red, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/ammo_box/magazine/m10mm, +/obj/item/ammo_box/magazine/m9mm, +/obj/item/ammo_box/magazine/m9mm, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_ship) "bZ" = ( @@ -728,7 +728,7 @@ req_one_access_txt = "150"; secure = 1 }, -/obj/item/ammo_box/c10mm, +/obj/item/ammo_box/c9mm, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/syndicate_forgotten_ship) "cf" = ( @@ -1114,7 +1114,7 @@ /area/ruin/space/has_grav/syndicate_forgotten_ship) "da" = ( /obj/structure/table/reinforced, -/obj/item/ammo_box/c10mm, +/obj/item/ammo_box/c9mm, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_ship) "db" = ( diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 4519e4da2ef..69409ace842 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -460,7 +460,7 @@ /datum/outfit/syndicate_empty/battlecruiser/assault name = "Syndicate Battlecruiser Assault Operative" uniform = /obj/item/clothing/under/syndicate/combat - l_pocket = /obj/item/ammo_box/magazine/m10mm + l_pocket = /obj/item/ammo_box/magazine/m9mm r_pocket = /obj/item/kitchen/knife/combat/survival belt = /obj/item/storage/belt/military suit = /obj/item/clothing/suit/armor/vest @@ -670,6 +670,7 @@ r_pocket = /obj/item/kitchen/knife/combat/survival belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/syndicate_command/captain_id + implants = list(/obj/item/implant/weapons_auth) backpack_contents = list(/obj/item/documents/syndicate/red, /obj/item/paper/fluff/ruins/forgottenship/password, /obj/item/gun/ballistic/automatic/pistol/aps) /obj/effect/mob_spawn/human/beach/alive