Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
This commit is contained in:
@@ -392,6 +392,8 @@
|
||||
|
||||
character.update_parallax_teleport()
|
||||
|
||||
job.standard_assign_skills(character.mind)
|
||||
|
||||
SSticker.minds += character.mind
|
||||
|
||||
var/mob/living/carbon/human/humanc
|
||||
|
||||
@@ -23,11 +23,7 @@
|
||||
if(!pref_species)
|
||||
var/rando_race = pick(GLOB.roundstart_races)
|
||||
pref_species = new rando_race()
|
||||
features = random_features(pref_species?.id)
|
||||
if(gender == MALE || gender != FEMALE)
|
||||
features["body_model"] = gender
|
||||
else if(gender == PLURAL)
|
||||
features["body_model"] = pick(MALE,FEMALE)
|
||||
features = random_features(pref_species?.id, gender)
|
||||
age = rand(AGE_MIN,AGE_MAX)
|
||||
|
||||
/datum/preferences/proc/update_preview_icon(equip_job = TRUE)
|
||||
|
||||
@@ -570,7 +570,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
views |= i
|
||||
var/new_view = input("Choose your new view", "Modify view range", 7) as null|anything in views
|
||||
if(new_view)
|
||||
client.change_view(CLAMP(new_view, 7, max_view))
|
||||
client.change_view(clamp(new_view, 7, max_view))
|
||||
else
|
||||
client.change_view(CONFIG_GET(string/default_view))
|
||||
|
||||
@@ -937,3 +937,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
spawners_menu = new(src)
|
||||
|
||||
spawners_menu.ui_interact(src)
|
||||
|
||||
/mob/dead/observer/verb/game_info()
|
||||
set name = "Game info"
|
||||
set desc = "Shows various info relating to the game mode, antagonists etc."
|
||||
set category = "Ghost"
|
||||
if(!started_as_observer && can_reenter_corpse)
|
||||
to_chat(src, "You cannot see this info unless you are an observer or you've chosen Do Not Resuscitate!")
|
||||
return
|
||||
var/list/stuff = list("[SSticker.mode.name]")
|
||||
stuff += "Antagonists:\n"
|
||||
for(var/datum/antagonist/A in GLOB.antagonists)
|
||||
if(A.owner)
|
||||
stuff += "[A.owner] the [A.name]"
|
||||
var/ghost_info = SSticker.mode.ghost_info()
|
||||
if(ghost_info)
|
||||
stuff += ghost_info
|
||||
to_chat(src,stuff.Join("\n"))
|
||||
|
||||
Reference in New Issue
Block a user