mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Makes various things return qdel hints on initialization (#26607)
* makes apcs destroy properly with a null area
* starts cleanup of initialize failures and hint returns
* Revert "makes apcs destroy properly with a null area"
This reverts commit 9a9175cd37.
* narsie returns qdel hint now
* make lightgeists clean up hud on destroy
* use the proper hud removal proc, but this still fails somehow. god help me.
* missed one
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -178,7 +178,7 @@
|
||||
name = "\improper Crew Reawakening Report"
|
||||
|
||||
/obj/item/paper/fluff/ruins/oldstation/report/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
init_current_date_string()
|
||||
info = "Artificial Program's report to surviving crewmembers.<br><br>Crew were placed into cryostasis 10 March, 2445.<br><br>Crew were awoken from cryostasis [GLOB.current_date_string].<br><br> \
|
||||
<b>SIGNIFICANT EVENTS OF NOTE</b><br>1: The primary radiation detectors were taken offline after [GLOB.game_year - 2445] years due to power failure, secondary radiation detectors showed no residual \
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
item_state = "tajblind_engi"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/meson/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has an optical meson scanner integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/meson/equipped(mob/user, slot, initial)
|
||||
@@ -87,7 +87,7 @@
|
||||
actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/toggle_research_scanner)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/sci/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has science goggles integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/sci/item_action_slot_check(slot)
|
||||
@@ -102,7 +102,7 @@
|
||||
examine_extensions = list(EXAMINE_HUD_MEDICAL_READ)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/med/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has a health HUD integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/sec
|
||||
@@ -113,7 +113,7 @@
|
||||
examine_extensions = list(EXAMINE_HUD_SECURITY_READ)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/sec/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has a security HUD integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded
|
||||
@@ -122,7 +122,7 @@
|
||||
tint = FLASH_PROTECTION_FLASH
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has an in-built flash protection.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/meson
|
||||
@@ -131,7 +131,7 @@
|
||||
item_state = "tajblind_engi"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/meson/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has an optical meson scanner integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/meson/equipped(mob/user, slot, initial)
|
||||
@@ -158,7 +158,7 @@
|
||||
actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/toggle_research_scanner)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/sci/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has science goggles integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/sci/item_action_slot_check(slot)
|
||||
@@ -173,7 +173,7 @@
|
||||
examine_extensions = list(EXAMINE_HUD_MEDICAL_READ)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/med/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has a health HUD integrated into it.</span>"
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/sec
|
||||
@@ -185,7 +185,7 @@
|
||||
examine_extensions = list(EXAMINE_HUD_SECURITY_READ)
|
||||
|
||||
/obj/item/clothing/glasses/hud/tajblind/shaded/sec/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
desc += "<br><span class='notice'>It has a security HUD integrated into it.</span>"
|
||||
|
||||
#undef MODE_OFF
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
var/mob/living/carbon/human/wearer = loc.loc //loc is the hardsuit, so its loc is the wearer
|
||||
if(ishuman(wearer))
|
||||
register_camera(wearer)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/head/helmet/space/hardsuit/ert/attack_self(mob/user)
|
||||
if(camera || !has_camera)
|
||||
|
||||
@@ -285,8 +285,13 @@
|
||||
. = ..()
|
||||
remove_verb(src, /mob/living/verb/pulled)
|
||||
remove_verb(src, /mob/verb/me_verb)
|
||||
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
|
||||
medsensor.add_hud_to(src)
|
||||
var/datum/atom_hud/med_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
|
||||
med_hud.add_hud_to(src)
|
||||
|
||||
/mob/living/simple_animal/hostile/lightgeist/Destroy()
|
||||
var/datum/atom_hud/med_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
|
||||
med_hud.remove_hud_from(src)
|
||||
return ..()
|
||||
|
||||
/mob/living/simple_animal/hostile/lightgeist/AttackingTarget()
|
||||
. = ..()
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
to_chat(world, "<font size='15' color='red'><b> [uppertext(name)] HAS FALLEN</b></font>")
|
||||
SEND_SOUND(world, sound('sound/hallucinations/wail.ogg'))
|
||||
SSticker.mode?.cult_team?.narsie_death()
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
|
||||
user.forceMove(get_turf(src)) //make_new_construct spawns harvesters at observers locations, could be used to get into admin rooms/CC
|
||||
|
||||
@@ -247,11 +247,11 @@
|
||||
|
||||
/obj/machinery/light/built/Initialize(mapload)
|
||||
status = LIGHT_EMPTY
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/machinery/light/small/built/Initialize(mapload)
|
||||
status = LIGHT_EMPTY
|
||||
..()
|
||||
return ..()
|
||||
|
||||
// create a new lighting fixture
|
||||
/obj/machinery/light/Initialize(mapload)
|
||||
|
||||
Reference in New Issue
Block a user