cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-17 11:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] obj screen to atom movable screen (#11719)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-21 16:04:35 -07:00
committed by GitHub
parent fd68853af6
commit 303e88c0b2
141 changed files with 1307 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_effects.dm
+2 -2
View File
@@ -197,7 +197,7 @@
if("adspam")
if(target.client)
target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15)
target.client.create_fake_ad_popup_multiple(/atom/movable/screen/popup/default, 15)
if("peppernade")
var/obj/item/grenade/chem_grenade/teargas/grenade = new /obj/item/grenade/chem_grenade/teargas
@@ -322,7 +322,7 @@
if("elder_smite")
if(!target.ckey)
return
target.overlay_fullscreen("scrolls", /obj/screen/fullscreen/scrolls, 1)
target.overlay_fullscreen("scrolls", /atom/movable/screen/fullscreen/scrolls, 1)
addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, clear_fullscreen), "scrolls"), 20 SECONDS)
////////MEDICAL//////////////
code/modules/admin/verbs/smite.dm
+2 -2
View File
@@ -157,7 +157,7 @@
if(SMITE_AD_SPAM)
if(target.client)
target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15)
target.client.create_fake_ad_popup_multiple(/atom/movable/screen/popup/default, 15)
if(SMITE_TERROR)
if(ishuman(target))
@@ -351,7 +351,7 @@ var/redspace_abduction_z
var/tip = pick(bad_tips)
to_chat(target, "<span class='notice' style='font: small-caps bold large monospace!important'>Tip of the day:</span><br><span class='notice'>[tip]</span>")
var/obj/screen/loader = new(target)
var/atom/movable/screen/loader = new(target)
loader.name = "Autosaving..."
loader.desc = "A disc icon that represents your game autosaving. Please wait."
loader.icon = 'icons/obj/discs_vr.dmi'