cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors move procs to support multitle objects (#6423)

Browse Source 
* Refactors move procs to support multitle objects

* Update _blob.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-22 23:40:04 +02:00
committed by GitHub
parent 3d784d4c1e
commit d85a02babd
82 changed files with 349 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -757,8 +757,8 @@
*Checking Exited() to detect if a hat gets up and walks off.
*Drones and pAIs might do this, after all.
*/
/mob/living/silicon/robot/Exited(atom/A)
if(hat && hat == A)
/mob/living/silicon/robot/Exited(atom/movable/gone, direction)
if(hat && hat == gone)
hat = null
if(!QDELETED(src)) //Don't update icons if we are deleted.
update_icons()
code/modules/mob/living/simple_animal/bot/floorbot.dm
+2 -2
View File
@@ -54,8 +54,8 @@
health = 100
maxHealth = 100
/mob/living/simple_animal/bot/floorbot/Exited(atom/movable/A, atom/newloc)
if(A == tilestack)
/mob/living/simple_animal/bot/floorbot/Exited(atom/movable/gone, direction)
if(tilestack == gone)
if(tilestack && tilestack.max_amount < tilestack.amount) //split the stack if it exceeds its normal max_amount
var/iterations = round(tilestack.amount/tilestack.max_amount) //round() without second arg floors the value
for(var/a in 1 to iterations)
code/modules/mob/living/simple_animal/hostile/carp.dm
+2 -2
View File
@@ -280,9 +280,9 @@
return
return ..()
/mob/living/simple_animal/hostile/carp/cayenne/Exited(atom/movable/AM, atom/newLoc)
/mob/living/simple_animal/hostile/carp/cayenne/Exited(atom/movable/gone, direction)
. = ..()
if(AM == disky)
if(disky == gone)
disky = null
update_icon()
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+3 -3
View File
@@ -766,9 +766,9 @@ SKYRAT REMOVAL EDIT END*/
holder_animal = loc
START_PROCESSING(SSobj, src)
/obj/structure/closet/stasis/Entered(atom/A)
if(isliving(A) && holder_animal)
var/mob/living/L = A
/obj/structure/closet/stasis/Entered(atom/movable/arrived, direction)
if(isliving(arrived) && holder_animal)
var/mob/living/L = arrived
L.notransform = 1
ADD_TRAIT(L, TRAIT_MUTE, STASIS_MUTE)
L.status_flags |= GODMODE
code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+2 -2
View File
@@ -382,9 +382,9 @@
/mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton/add_cell_sample()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_GLUTTON, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
/mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton/Exited(atom/movable/AM, atom/newLoc)
/mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton/Exited(atom/movable/gone, direction)
. = ..()
prank_pouch -= AM
prank_pouch -= gone
///This ability will let you fire one random item from your pouch,
/obj/effect/proc_holder/regurgitate