cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

obj screen to atom movable screen (#18434)

Browse Source 
* obj screen to atom movable screen

* .
This commit is contained in:
Kashargul
2025-09-22 00:31:30 +02:00
committed by GitHub
parent c7a94c8dfa
commit 45bd1930ec
131 changed files with 1229 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/antags/changeling/changeling.dm
+3 -3
View File
@@ -177,7 +177,7 @@ var/list/datum/power/changeling/powerinstances = list()
add_verb(src, P.verbpath)
if(P.make_hud_button)
if(!src.ability_master)
src.ability_master = new /obj/screen/movable/ability_master(src)
src.ability_master = new /atom/movable/screen/movable/ability_master(src)
src.ability_master.add_ling_ability(
object_given = src,
verb_given = P.verbpath,
@@ -215,7 +215,7 @@ var/list/datum/power/changeling/powerinstances = list()
for(var/datum/power/changeling/P in comp.purchased_powers)
if(P.isVerb)
remove_verb(src, P.verbpath)
var/obj/screen/ability/verb_based/changeling/C = ability_master.get_ability_by_proc_ref(P.verbpath)
var/atom/movable/screen/ability/verb_based/changeling/C = ability_master.get_ability_by_proc_ref(P.verbpath)
if(C)
ability_master.remove_ability(C)
@@ -407,7 +407,7 @@ var/list/datum/power/changeling/powerinstances = list()
if(Thepower.make_hud_button && Thepower.isVerb)
if(owner.ability_master)
QDEL_NULL(owner.ability_master)
owner.ability_master = new /obj/screen/movable/ability_master(owner)
owner.ability_master = new /atom/movable/screen/movable/ability_master(owner)
owner.ability_master.add_ling_ability(
object_given = owner,
verb_given = Thepower.verbpath,
code/datums/components/crafting/crafting.dm
+2 -2
View File
@@ -6,7 +6,7 @@
SIGNAL_HANDLER
var/datum/hud/H = user.hud_used
var/obj/screen/craft/C = new()
var/atom/movable/screen/craft/C = new()
C.icon = H.ui_style
C.color = H.ui_color
C.alpha = H.ui_alpha
@@ -527,7 +527,7 @@
learned_recipes |= R
// Screen objects
/obj/screen/craft
/atom/movable/screen/craft
name = "crafting menu"
icon = 'icons/mob/screen/midnight.dmi'
icon_state = "craft"
code/datums/components/species/shadekin/helpers/comp_helpers.dm
+6 -6
View File
@@ -146,10 +146,10 @@
///Gets rid of any old ability master if we have one and replaces it with a shadekin ability master.
/datum/component/shadekin/proc/create_shadekin_abilities()
if(!owner.ability_master)
owner.ability_master = new /obj/screen/movable/ability_master/shadekin(owner)
else if(!istype(owner.ability_master, /obj/screen/movable/ability_master/shadekin))
owner.ability_master = new /atom/movable/screen/movable/ability_master/shadekin(owner)
else if(!istype(owner.ability_master, /atom/movable/screen/movable/ability_master/shadekin))
QDEL_NULL(owner.ability_master)
owner.ability_master = new /obj/screen/movable/ability_master/shadekin(owner)
owner.ability_master = new /atom/movable/screen/movable/ability_master/shadekin(owner)
//Clears up our verbs. Used when rebuilding our verbs list..
/datum/component/shadekin/proc/clear_shadekin_abilities()
@@ -165,10 +165,10 @@
//Clears our abilities master and gives us a new, non-shadekin one. Used for destroy.
/datum/component/shadekin/proc/replace_shadekin_master()
if(!owner.ability_master)
owner.ability_master = new /obj/screen/movable/ability_master(owner)
else if(istype(owner.ability_master, /obj/screen/movable/ability_master/shadekin))
owner.ability_master = new /atom/movable/screen/movable/ability_master(owner)
else if(istype(owner.ability_master, /atom/movable/screen/movable/ability_master/shadekin))
QDEL_NULL(owner.ability_master)
owner.ability_master = new /obj/screen/movable/ability_master(owner)
owner.ability_master = new /atom/movable/screen/movable/ability_master(owner)
clear_shadekin_abilities()
//wait, it's all light?
code/datums/components/species/xenochimera.dm
+7 -7
View File
@@ -269,11 +269,11 @@
return
owner.LoadComponent(/datum/component/hallucinations/xenochimera)
/obj/screen/xenochimera
/atom/movable/screen/xenochimera
icon = 'icons/mob/chimerahud.dmi'
invisibility = INVISIBILITY_ABSTRACT
/obj/screen/xenochimera/danger_level
/atom/movable/screen/xenochimera/danger_level
name = "danger level"
icon_state = "danger00" //first number is bool of whether or not we're in danger, second is whether or not we're feral
alpha = 200
@@ -331,7 +331,7 @@
//Scary spawnerization.
set_revival_delay(time)
owner.throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution)
owner.throw_alert("regen", /atom/movable/screen/alert/xenochimera/reconstitution)
addtimer(CALLBACK(src, PROC_REF(chimera_regenerate_ready)), time SECONDS, TIMER_DELETE_ME)
//Clicked regen while NOT dead
@@ -340,7 +340,7 @@
//Waiting for regen after being alive
set_revival_delay(time)
owner.throw_alert("regen", /obj/screen/alert/xenochimera/reconstitution)
owner.throw_alert("regen", /atom/movable/screen/alert/xenochimera/reconstitution)
addtimer(CALLBACK(src, PROC_REF(chimera_regenerate_nutrition)), time SECONDS, TIMER_DELETE_ME)
owner.lying = TRUE
// open_appearance_editor()
@@ -357,7 +357,7 @@
revive_ready = REVIVING_DONE
owner << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30)
owner.clear_alert("regen")
owner.throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch)
owner.throw_alert("hatch", /atom/movable/screen/alert/xenochimera/readytohatch)
/datum/component/xenochimera/proc/chimera_regenerate_ready()
if(!owner)
@@ -367,7 +367,7 @@
to_chat(owner, span_notice("Your body has recovered from its ordeal, ready to regenerate itself again."))
revive_ready = REVIVING_READY //reset their cooldown
owner.clear_alert("regen")
owner.throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch)
owner.throw_alert("hatch", /atom/movable/screen/alert/xenochimera/readytohatch)
// Was dead, still dead.
else
@@ -376,7 +376,7 @@
revive_ready = REVIVING_DONE
owner << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30)
owner.clear_alert("regen")
owner.throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch)
owner.throw_alert("hatch", /atom/movable/screen/alert/xenochimera/readytohatch)
/mob/living/carbon/human/proc/hatch()
set name = "Hatch"