Fixes verbs not being given properly when joining ghost spawners/aghosting back into your body (#16575)

* fix some more edge cases

* Update html/changelogs/mattatlas-aghostverbs.yml

* oops

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-06-28 18:11:23 +02:00
committed by GitHub
parent bfc431f200
commit 263cc2f575
11 changed files with 61 additions and 6 deletions
+3 -1
View File
@@ -86,6 +86,8 @@
G.equipOutfit(outfit_type, FALSE)
technomancers.add_antagonist(G.mind, FALSE, TRUE, FALSE, FALSE, preserve_appearance)
G.client.init_verbs()
qdel(src)
return G
@@ -96,4 +98,4 @@
mob_type = /mob/living/carbon/human/technomancer_golem
ghost_role_id = "technogolem"
outfit_type = /datum/outfit/admin/techomancer/golem
preserve_appearance = TRUE
preserve_appearance = TRUE
+2
View File
@@ -74,6 +74,8 @@
seeking_player = FALSE
welcome_drone()
client.init_verbs()
return src
/mob/living/silicon/robot/drone/mining/welcome_drone()
@@ -303,6 +303,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
mind.current.ajourn=0
mind.current.key = key
mind.current.teleop = null
mind.current.client.init_verbs()
if(!admin_ghosted)
announce_ghost_joinleave(mind, 0, "They now occupy their body again.")
return 1
@@ -59,6 +59,8 @@
if(istype(A, /area/assembly/robotics))
global_announcer.autosay("A positronic brain has completed its boot process in: [A.name].", "Robotics Oversight", "Science")
brainmob.client.init_verbs()
return src
/obj/item/device/mmi/digital/posibrain/update_name()
@@ -1485,10 +1485,13 @@
species.set_default_tail(src)
if(client)
client.init_verbs()
if(species)
return 1
return TRUE
else
return 0
return FALSE
/mob/living/carbon/human/proc/fill_out_culture_data()
@@ -314,6 +314,7 @@
G.religion = G.origin.possible_religions[1]
G.preEquipOutfit(/datum/outfit/admin/golem, FALSE)
G.equipOutfit(/datum/outfit/admin/golem, FALSE)
G.client.init_verbs()
to_chat(G, SPAN_NOTICE("You are a golem. Serve your master, and assist them in completing their goals at any cost."))
qdel(src)
@@ -46,6 +46,7 @@
if(assigned_antagonist.get_antag_radio())
module.channels[assigned_antagonist.get_antag_radio()] = TRUE
radio.recalculateChannels()
client.init_verbs()
say("Boot sequence complete!")
return src
+1
View File
@@ -1216,6 +1216,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
/mob/assign_player(var/mob/user)
ckey = user.ckey
resting = FALSE // ghosting sets resting to true
client.init_verbs()
return src
/mob/proc/get_standard_pixel_x()
+2 -2
View File
@@ -56,8 +56,8 @@
var/mob/abstract/observer/O = user
if(O.antagHUD && player_is_antag(M.mind))
category = M.mind.special_role
if(!category)
category = "Alive"
if(!category)
category = "Alive"
var/special_char = is_special_character(M)
if(!name)
continue
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed aghosting not giving you your verbs back."
- bugfix: "Fixed joining mob spawners not giving you the right verbs."
File diff suppressed because one or more lines are too long