Skip to content

Commit

Permalink
SSD takeover fixes (#16319)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ldip999 authored Jul 11, 2024
1 parent 3f255da commit 8a849c3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
8 changes: 5 additions & 3 deletions code/datums/actions/observer_action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@
if(new_mob.stat == DEAD)
to_chat(owner, span_warning("You cannot join if the mob is dead."))
return FALSE
switch(tgui_alert(owner, "Are you sure you want to take " + new_mob.real_name +" ("+new_mob.job.title+")?", "Take SSD mob", list("Yes", "No",)))
if("No")
return
if(tgui_alert(owner, "Are you sure you want to take " + new_mob.real_name +" ("+new_mob.job.title+")?", "Take SSD mob", list("Yes", "No",)) != "Yes")
return
if(isxeno(new_mob))
var/mob/living/carbon/xenomorph/ssd_xeno = new_mob
if(ssd_xeno.tier != XENO_TIER_MINION && XENODEATHTIME_CHECK(owner))
Expand Down Expand Up @@ -100,7 +99,10 @@
log_admin("[owner.key] took control of [new_mob.name] as [new_mob.p_they()] was ssd.")
new_mob.transfer_mob(owner)
var/mob/living/carbon/human/H = new_mob
var/datum/job/j = H.job
var/datum/outfit/job/o = j.outfit
H.on_transformation()
o.handle_id(H)

//respawn button for campaign gamemode
/datum/action/observer_action/campaign_respawn
Expand Down
10 changes: 8 additions & 2 deletions code/modules/mob/mob_transformation_simple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@
if(subspecies)
set_species(subspecies)
if(client)
name = client.prefs.real_name
real_name = client.prefs.real_name
if(issynth(src))
name = client.prefs.synthetic_name
real_name = client.prefs.synthetic_name
else
name = client.prefs.real_name
real_name = client.prefs.real_name
gender = client.prefs.gender
h_style = client.prefs.h_style
f_style = client.prefs.f_style
Expand All @@ -75,6 +79,8 @@
age = client.prefs.age
ethnicity = client.prefs.ethnicity
flavor_text = client.prefs.flavor_text
voice = client.prefs.tts_voice
pitch = client.prefs.tts_pitch
update_body()
update_hair()
regenerate_icons()
Expand Down

0 comments on commit 8a849c3

Please sign in to comment.