From 89bbf98b8f69d209281540b8702c94beeb481887 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:17:02 -0700
Subject: [PATCH] Bunch more runtimes
---
code/datums/components/_component.dm | 2 ++
code/modules/admin/verbs/debug.dm | 2 +-
code/modules/mob/dead/observer/observer.dm | 15 ++++++---------
hyperstation/code/obj/fleshlight.dm | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index a836ac95..ab0f7584 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -123,6 +123,8 @@
signal_enabled = TRUE
/datum/proc/UnregisterSignal(datum/target, sig_type_or_types)
+ if(!target)
+ CRASH("[src] tried to unregister a signal without having a target.")
var/list/lookup = target.comp_lookup
if(!signal_procs || !signal_procs[target] || !lookup)
return
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 8450793f..ac028d5d 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -487,7 +487,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(alert("This mob is being controlled by [M.key]. Are you sure you wish to assume control of it? [M.key] will be made a ghost.",,"Yes","No") != "Yes")
return
else
- var/mob/dead/observer/ghost = new/mob/dead/observer(M,1)
+ var/mob/dead/observer/ghost = new/mob/dead/observer(get_turf(M), M)
ghost.ckey = M.ckey
message_admins("[key_name_admin(usr)] assumed direct control of [M].")
log_admin("[key_name(usr)] assumed direct control of [M].")
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 50862ee1..752094a3 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -56,7 +56,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/deadchat_name
var/datum/spawners_menu/spawners_menu
-/mob/dead/observer/Initialize()
+/mob/dead/observer/Initialize(mapload, mob/body)
set_invisibility(GLOB.observer_default_invisibility)
add_verb(src, list(
@@ -77,11 +77,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
updateallghostimages()
- var/turf/T
- var/mob/body = loc
- if(ismob(body))
- T = get_turf(body) //Where is the body located?
-
+ if(body)
gender = body.gender
if(body.mind && body.mind.name)
name = body.mind.name
@@ -106,14 +102,15 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
update_icon()
- if(!T)
+ if(!isturf(loc))
+ var/turf/T
var/list/turfs = get_area_turfs(/area/shuttle/arrival)
if(turfs.len)
T = pick(turfs)
else
T = SSmapping.get_station_center()
- forceMove(T)
+ forceMove(T)
if(!name) //To prevent nameless ghosts
name = random_unique_name(gender)
@@ -268,7 +265,7 @@ Works together with spawning an observer, noted above.
if(!key || key[1] == "@" || (SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special, penalize) & COMPONENT_BLOCK_GHOSTING))
return //mob has no key, is an aghost or some component hijacked.
stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now
- var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc.
+ var/mob/dead/observer/ghost = new(get_turf(src), src) // Transfer safety to observer spawning proc.
SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
ghost.can_reenter_corpse = can_reenter_corpse
if (client && client.prefs && client.prefs.auto_ooc)
diff --git a/hyperstation/code/obj/fleshlight.dm b/hyperstation/code/obj/fleshlight.dm
index a2fc1f53..e881b225 100644
--- a/hyperstation/code/obj/fleshlight.dm
+++ b/hyperstation/code/obj/fleshlight.dm
@@ -118,7 +118,7 @@
option = "Fuck"
var/obj/item/organ/genital/vagina/V = portalunderwear.loc
- if(!V)
+ if(!V || !iscarbon(V))
return
var/mob/living/carbon/human/M = V.owner
@@ -298,4 +298,4 @@
/obj/item/paper/fluff/portallight
name = "Portal Fleshlight Instructions"
- info = "Thank you for purchasing the Silver Love Portal Fleshlight!
To use, simply register your new portal fleshlight with the provided underwear to link them together. The ask your lover to wear the underwear.
Have fun lovers,
Wilhelmina Steiner."
\ No newline at end of file
+ info = "Thank you for purchasing the Silver Love Portal Fleshlight!
To use, simply register your new portal fleshlight with the provided underwear to link them together. The ask your lover to wear the underwear.
Have fun lovers,
Wilhelmina Steiner."