cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] sleeper uses forcemove (#11647)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-14 14:34:42 -07:00
committed by GitHub
parent 1c4d917ea7
commit 8d7f7dfa75
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/Sleeper.dm
View File

@@ -383,7 +383,7 @@
if(!beaker) if(!beaker)
beaker = I beaker = I
user.drop_item() user.drop_item()
I.loc = src I.forceMove(src)
user.visible_message(span_infoplain(span_bold("\The [user]") + " adds \a [I] to \the [src]."), span_notice("You add \a [I] to \the [src].")) user.visible_message(span_infoplain(span_bold("\The [user]") + " adds \a [I] to \the [src]."), span_notice("You add \a [I] to \the [src]."))
else else
to_chat(user, span_warning("\The [src] has a beaker already.")) to_chat(user, span_warning("\The [src] has a beaker already."))
@@ -482,7 +482,7 @@
if(M.client) if(M.client)
M.client.perspective = EYE_PERSPECTIVE M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src M.client.eye = src
M.loc = src M.forceMove(src)
update_use_power(USE_POWER_ACTIVE) update_use_power(USE_POWER_ACTIVE)
occupant = M occupant = M
occupant.cozyloop.start() // CHOMPStation Add: Cozy Music occupant.cozyloop.start() // CHOMPStation Add: Cozy Music
@@ -497,7 +497,7 @@
occupant.client.eye = occupant.client.mob occupant.client.eye = occupant.client.mob
occupant.client.perspective = MOB_PERSPECTIVE occupant.client.perspective = MOB_PERSPECTIVE
occupant.Stasis(0) occupant.Stasis(0)
occupant.loc = src.loc occupant.forceMove(get_turf(src))
occupant.cozyloop.stop() // CHOMPStation Add: Cozy Music occupant.cozyloop.stop() // CHOMPStation Add: Cozy Music
occupant = null occupant = null
for(var/atom/movable/A in src) // In case an object was dropped inside or something for(var/atom/movable/A in src) // In case an object was dropped inside or something
@@ -505,7 +505,7 @@
continue continue
if(A in component_parts) if(A in component_parts)
continue continue
A.loc = src.loc A.forceMove(get_turf(src))
update_use_power(USE_POWER_IDLE) update_use_power(USE_POWER_IDLE)
update_icon() update_icon()
toggle_filter() toggle_filter()
@@ -513,7 +513,7 @@
/obj/machinery/sleeper/proc/remove_beaker() /obj/machinery/sleeper/proc/remove_beaker()
if(beaker) if(beaker)
beaker.loc = src.loc beaker.forceMove(get_turf(src))
beaker = null beaker = null
toggle_filter() toggle_filter()