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

Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)

Browse Source 
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
This commit is contained in:
spookydonut
2020-01-28 10:51:15 +13:00
committed by oranges
parent b7aa7ef4b4
commit ac7f2b5166
25 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/containment_field.dm
+5 -5
View File
@@ -64,12 +64,12 @@
else
..()
/obj/machinery/field/containment/Crossed(mob/mover)
if(isliving(mover))
shock(mover)
/obj/machinery/field/containment/Crossed(atom/movable/AM)
if(isliving(AM))
shock(AM)
if(ismachinery(mover) || isstructure(mover) || ismecha(mover))
bump_field(mover)
if(ismachinery(AM) || isstructure(AM) || ismecha(AM))
bump_field(AM)
/obj/machinery/field/containment/proc/set_master(master1,master2)
if(!master1 || !master2)