shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied suggestions and minor tweaks.

Browse Source
This commit is contained in:
Useroth
2019-12-26 20:03:43 +01:00
parent cbff758d1a
commit 35846c452a
3 changed files with 759 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/CentCom.dmm
+745 -612
View File
File diff suppressed because it is too large Load Diff
code/game/objects/structures/ghost_role_spawners.dm
+12 -24
View File
@@ -607,33 +607,21 @@
density = FALSE
death = FALSE
assignedrole = "Ghost Cafe Visitor"
flavour_text = "Is this what life after death is like?"
skip_reentry_check = TRUE
banType = "ghostcafe"
/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()
new_spawn.client.prefs.copy_to(new_spawn)
var/datum/outfit/O = new /datum/outfit/ghostcafe()
O.equip(new_spawn)
SSjob.equip_loadout(null, new_spawn, FALSE)
SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
/datum/outfit/ghostcafe
name = "ID, jumpsuit and shoes"
uniform = /obj/item/clothing/under/color/random
shoes = /obj/item/clothing/shoes/sneakers/black
id = /obj/item/card/id
code/modules/awaymissions/corpse.dm
+2 -1
View File
@@ -29,6 +29,7 @@
var/show_flavour = TRUE
var/banType = "lavaland"
var/ghost_usable = TRUE
var/skip_reentry_check = FALSE //Skips the ghost role blacklist time for people who ghost/suicide/cryo
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/effect/mob_spawn/attack_ghost(mob/user, latejoinercalling)
@@ -44,7 +45,7 @@
return
if(isobserver(user))
var/mob/dead/observer/O = user
if(!O.can_reenter_round())
if(!O.can_reenter_round() && !skip_reentry_check)
return FALSE
var/ghost_role = alert(latejoinercalling ? "Latejoin as [mob_name]? (This is a ghost role, and as such, it's very likely to be off-station.)" : "Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
if(ghost_role == "No" || !loc)