From 36c6bf443a6dcd2bd0fb13f943ea375c812f7924 Mon Sep 17 00:00:00 2001 From: EgorDinamit Date: Thu, 13 Feb 2020 12:25:33 +0400 Subject: [PATCH] Probably the last update --- _maps/RandomRuins/SpaceRuins/forgottenship.dmm | 2 +- code/game/objects/structures/ghost_role_spawners.dm | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index fa2ca20563e..8970b4b6477 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -126,7 +126,7 @@ "cv" = (/obj/machinery/computer/security/telescreen/interrogation{network = list("fsci"); pixel_y = 32; req_one_access_txt = "150"; screen_loc = ""},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "cw" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/switchblade,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "cx" = (/obj/structure/cable,/obj/machinery/atmospherics/components/unary/vent_scrubber/layer1{icon_state = "scrub_map-1"; dir = 4},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) -"cy" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "pipe11-2"; dir = 10},/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) +"cy" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "pipe11-2"; dir = 10},/obj/item/wrench,/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "cz" = (/obj/structure/cable,/obj/machinery/atmospherics/components/unary/vent_pump,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "cA" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/components/unary/vent_pump,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "cB" = (/obj/machinery/atmospherics/components/unary/vent_pump,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 678a4ff9ed3..692d3d5c0e2 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -625,17 +625,20 @@ mob_gender = "male" outfit = /datum/outfit/syndicatespace/syndicaptain +/datum/outfit/syndicatespace/syndicaptain/post_equip(mob/living/carbon/human/H) + H.faction |= ROLE_SYNDICATE + /datum/outfit/syndicatespace/syndicrew name = "Syndicate Ship Crew Member" uniform = /obj/item/clothing/under/syndicate/combat glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/syndicate - r_hand = /obj/item/kitchen/knife/combat/survival ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack l_pocket = /obj/item/gun/ballistic/automatic/pistol + r_pocket = /obj/item/kitchen/knife/combat/survival belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/syndicate_command/crew_id implants = list(/obj/item/implant/weapons_auth) @@ -646,13 +649,13 @@ suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/syndicate - r_hand = /obj/item/kitchen/knife/combat/survival head = /obj/item/clothing/head/HoS/beret/syndicate ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack l_pocket = /obj/item/gun/ballistic/automatic/pistol/APS + r_pocket = /obj/item/kitchen/knife/combat/survival belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/syndicate_command/captain_id backpack_contents = list(/obj/item/documents/syndicate/red, /obj/item/paper/fluff/ruins/forgottenship/password)