mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] sleeper uses forcemove (#11647)
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:
committed by
GitHub
parent
1c4d917ea7
commit
8d7f7dfa75
@@ -383,7 +383,7 @@
|
||||
if(!beaker)
|
||||
beaker = I
|
||||
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]."))
|
||||
else
|
||||
to_chat(user, span_warning("\The [src] has a beaker already."))
|
||||
@@ -482,7 +482,7 @@
|
||||
if(M.client)
|
||||
M.client.perspective = EYE_PERSPECTIVE
|
||||
M.client.eye = src
|
||||
M.loc = src
|
||||
M.forceMove(src)
|
||||
update_use_power(USE_POWER_ACTIVE)
|
||||
occupant = M
|
||||
occupant.cozyloop.start() // CHOMPStation Add: Cozy Music
|
||||
@@ -497,7 +497,7 @@
|
||||
occupant.client.eye = occupant.client.mob
|
||||
occupant.client.perspective = MOB_PERSPECTIVE
|
||||
occupant.Stasis(0)
|
||||
occupant.loc = src.loc
|
||||
occupant.forceMove(get_turf(src))
|
||||
occupant.cozyloop.stop() // CHOMPStation Add: Cozy Music
|
||||
occupant = null
|
||||
for(var/atom/movable/A in src) // In case an object was dropped inside or something
|
||||
@@ -505,7 +505,7 @@
|
||||
continue
|
||||
if(A in component_parts)
|
||||
continue
|
||||
A.loc = src.loc
|
||||
A.forceMove(get_turf(src))
|
||||
update_use_power(USE_POWER_IDLE)
|
||||
update_icon()
|
||||
toggle_filter()
|
||||
@@ -513,7 +513,7 @@
|
||||
|
||||
/obj/machinery/sleeper/proc/remove_beaker()
|
||||
if(beaker)
|
||||
beaker.loc = src.loc
|
||||
beaker.forceMove(get_turf(src))
|
||||
beaker = null
|
||||
toggle_filter()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user