cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] /obj/screen --> /atom/movable/screen (#1646)

Browse Source 
* /obj/screen --> /atom/movable/screen

* Update storage.dm

* Update radial.dm

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-11-11 04:12:50 +01:00
committed by GitHub
co-authored by TemporalOroboros Azarak
parent 4e460d9cd7
commit e768cef297
158 changed files with 1176 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
H.static_inventory += C
CL.screen += C
@@ -321,7 +321,7 @@
container.emptyStorage()
qdel(DL)
/datum/component/personal_crafting/proc/component_ui_interact(obj/screen/craft/image, location, control, params, user)
/datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user)
SIGNAL_HANDLER_DOES_SLEEP
if(user == parent)
code/datums/components/embedded.dm
+1 -1
View File
@@ -91,7 +91,7 @@
var/damage = weapon.throwforce
if(harmful)
victim.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
victim.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject)
playsound(victim,'sound/weapons/bladeslice.ogg', 40)
weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody!
damage += weapon.w_class * impact_pain_mult
code/datums/components/mood.dm
+1 -1
View File
@@ -10,7 +10,7 @@
var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
var/list/datum/mood_event/mood_events = list()
var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
var/obj/screen/mood/screen_obj
var/atom/movable/screen/mood/screen_obj
/datum/component/mood/Initialize()
if(!isliving(parent))
code/datums/components/storage/storage.dm
+5 -5
View File
@@ -34,8 +34,8 @@
var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number.
var/obj/screen/storage/boxes //storage display object
var/obj/screen/close/closer //close button object
var/atom/movable/screen/storage/boxes //storage display object
var/atom/movable/screen/close/closer //close button object
var/allow_big_nesting = FALSE //allow storage objects of the same or greater size.
@@ -570,14 +570,14 @@
user_show_to_mob(M)
playsound(A, "rustle", 50, TRUE, -5) //SKYRAT EDIT ADDITION - AESTHETICS
A.do_jiggle() //SKYRAT EDIT ADDITION - AESTHETICS
if(!istype(over_object, /obj/screen))
if(!istype(over_object, /atom/movable/screen))
dump_content_at(over_object, M)
return
if(A.loc != M)
return
//playsound(A, "rustle", 50, TRUE, -5) //SKYRAT EDIT REMOVAL - AESTHETICS
if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(A, H.held_index)
return
A.add_fingerprint(M)
code/datums/components/tackle.dm
+4 -4
View File
@@ -387,7 +387,7 @@
user.emote("scream")
user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed!
shake_camera(user, 7, 7)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 4.5)
if(97 to 98)
@@ -403,7 +403,7 @@
playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
user.emote("gurgle")
shake_camera(user, 7, 7)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 4.5)
if(93 to 96)
@@ -414,7 +414,7 @@
user.gain_trauma_type(BRAIN_TRAUMA_MILD)
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
shake_camera(user, 6, 6)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 3.5)
if(86 to 92)
@@ -427,7 +427,7 @@
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
user.Knockdown(40)
shake_camera(user, 5, 5)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 2.5)
if(68 to 85)