From cbff758d1a07e602b1532717b9a000d9ea458f2e Mon Sep 17 00:00:00 2001 From: Useroth Date: Thu, 26 Dec 2019 07:49:48 +0100 Subject: [PATCH] Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. --- _maps/map_files/generic/CentCom.dmm | 18 ++++---- .../objects/structures/ghost_role_spawners.dm | 42 +++++++++++++++++++ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 80e80cd6a9..f999b0f224 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11585,11 +11585,6 @@ }, /turf/open/floor/plasteel/white, /area/centcom/holding) -"Bp" = ( -/obj/item/paicard, -/obj/structure/table/wood, -/turf/open/floor/engine/cult, -/area/wizard_station) "Bs" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement, @@ -16598,6 +16593,10 @@ "Mm" = ( /turf/open/floor/grass, /area/centcom/holding) +"Ms" = ( +/obj/effect/mob_spawn/human/ghostcafe, +/turf/open/floor/wood, +/area/centcom/holding) "Mt" = ( /obj/structure/window/reinforced{ dir = 4 @@ -17246,6 +17245,11 @@ "Qe" = ( /turf/open/ai_visible, /area/ai_multicam_room) +"Qi" = ( +/obj/item/paicard, +/obj/structure/table/wood, +/turf/open/floor/engine/cult, +/area/wizard_station) "Qk" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, @@ -25747,7 +25751,7 @@ lI lI lI Ax -Bp +Qi qZ qZ Ax @@ -47628,7 +47632,7 @@ Xk GY NT Xk -Xk +Ms Xk NT vt diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 688006a6e3..8df3e417f7 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -595,3 +595,45 @@ /obj/effect/mob_spawn/human/pirate/gunner rank = "Gunner" + +/obj/effect/mob_spawn/human/ghostcafe + name = "ghost cafe sleeper" + uses = -1 + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper" + mob_name = "a ghost cafe visitor" + roundstart = FALSE + anchored = TRUE + density = FALSE + death = FALSE + assignedrole = "Ghost Cafe Visitor" + +/obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn) + if(new_spawn.client) + new_spawn.fully_replace_character_name(newname = new_spawn.client.prefs.real_name) + new_spawn.nameless = new_spawn.client.prefs.nameless + new_spawn.gender = new_spawn.client.prefs.gender + new_spawn.dna.features = new_spawn.client.prefs.features.Copy() + new_spawn.flavor_text = new_spawn.dna.features["flavor_text"] + new_spawn.dna.custom_species = new_spawn.client.prefs.custom_species + new_spawn.eye_color = new_spawn.client.prefs.eye_color + new_spawn.hair_color = new_spawn.client.prefs.facial_hair_color + new_spawn.skin_tone = new_spawn.client.prefs.skin_tone + new_spawn.facial_hair_style = new_spawn.client.prefs.facial_hair_style + new_spawn.hair_color = new_spawn.client.prefs.hair_color + new_spawn.hair_style = new_spawn.client.prefs.hair_style + new_spawn.saved_socks = new_spawn.client.prefs.socks + new_spawn.socks = new_spawn.client.prefs.socks + new_spawn.socks_color = new_spawn.client.prefs.socks_color + new_spawn.saved_undershirt = new_spawn.client.prefs.undershirt + new_spawn.undershirt = new_spawn.client.prefs.undershirt + new_spawn.shirt_color = new_spawn.client.prefs.shirt_color + new_spawn.saved_underwear = new_spawn.client.prefs.underwear + new_spawn.underwear = new_spawn.client.prefs.underwear + new_spawn.undie_color = new_spawn.client.prefs.undie_color + new_spawn.set_species(new_spawn.client.prefs.pref_species, icon_update=1) + new_spawn.give_genitals(TRUE) + var/datum/outfit/O = new /datum/outfit/vr() + O.equip(new_spawn) + SSjob.equip_loadout(null, new_spawn, FALSE) + SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)