diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm index 46e179ee567..3d28fdd8116 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm @@ -40,7 +40,7 @@ #define COMSIG_ATOM_NARSIE_ACT "atom_narsie_act" ///from base of atom/rcd_act(): (/mob, /obj/item/construction/rcd, passed_mode) #define COMSIG_ATOM_RCD_ACT "atom_rcd_act" -///from base of atom/singularity_pull(): (/datum/component/singularity, current_size) +///from base of atom/singularity_pull(): (/atom, current_size) #define COMSIG_ATOM_SING_PULL "atom_sing_pull" ///from obj/machinery/bsa/full/proc/fire(): () #define COMSIG_ATOM_BSA_BEAM "atom_bsa_beam_pass" diff --git a/code/datums/beam.dm b/code/datums/beam.dm index ad27ee5ee3e..69da1c9142d 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -206,7 +206,7 @@ owner = null return ..() -/obj/effect/ebeam/singularity_pull() +/obj/effect/ebeam/singularity_pull(atom/singularity, current_size) return /obj/effect/ebeam/singularity_act() diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm index 7b69f02340c..8565d790612 100644 --- a/code/game/atom/atom_act.dm +++ b/code/game/atom/atom_act.dm @@ -151,7 +151,7 @@ * * Default behaviour is to send [COMSIG_ATOM_SING_PULL] and return */ -/atom/proc/singularity_pull(obj/singularity/singularity, current_size) +/atom/proc/singularity_pull(atom/singularity, current_size) SEND_SIGNAL(src, COMSIG_ATOM_SING_PULL, singularity, current_size) /** diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index f3760fda031..2834ffbd7e6 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -269,7 +269,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) return user.electrocute_act(10, src) -/obj/machinery/camera/singularity_pull(S, current_size) +/obj/machinery/camera/singularity_pull(atom/singularity, current_size) if (camera_enabled && current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects and the camera is still active, turn off the camera as it gets ripped off the wall. toggle_cam(null, 0) return ..() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 8385a639b7f..2b473c3dbe6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1825,7 +1825,7 @@ /obj/structure/fluff/airlock_filler/singularity_act() return -/obj/structure/fluff/airlock_filler/singularity_pull(S, current_size) +/obj/structure/fluff/airlock_filler/singularity_pull(atom/singularity, current_size) return /obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 3fc4dcf219a..b22959ce461 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -425,7 +425,7 @@ if(prob(33) && buildstage == FIRE_ALARM_BUILD_SECURED) //require fully wired electronics to set of the alarms alarm() -/obj/machinery/firealarm/singularity_pull(S, current_size) +/obj/machinery/firealarm/singularity_pull(atom/singularity, current_size) if (current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects, the fire alarm experiences integrity failure deconstruct() return ..() diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 04dd7e4809a..ede5302d512 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -26,7 +26,7 @@ /obj/effect/bump_teleporter/singularity_act() return -/obj/effect/bump_teleporter/singularity_pull() +/obj/effect/bump_teleporter/singularity_pull(atom/singularity, current_size) return /obj/effect/bump_teleporter/Bumped(atom/movable/bumper) diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index d83440ee9bd..11364a047b7 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -73,7 +73,7 @@ STOP_PROCESSING(SSfastprocess, src) . = ..() -/obj/effect/countdown/singularity_pull() +/obj/effect/countdown/singularity_pull(atom/singularity, current_size) return /obj/effect/countdown/singularity_act() diff --git a/code/game/objects/effects/effect_system/effect_shield.dm b/code/game/objects/effects/effect_system/effect_shield.dm index 9b1cc2c1bf2..d76712626b8 100644 --- a/code/game/objects/effects/effect_system/effect_shield.dm +++ b/code/game/objects/effects/effect_system/effect_shield.dm @@ -21,6 +21,6 @@ /obj/effect/shield/singularity_act() return -/obj/effect/shield/singularity_pull(S, current_size) +/obj/effect/shield/singularity_pull(atom/singularity, current_size) return diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index 0c050579de4..495c61510a6 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -50,7 +50,7 @@ /obj/effect/abstract resistance_flags = parent_type::resistance_flags | SHUTTLE_CRUSH_PROOF -/obj/effect/abstract/singularity_pull() +/obj/effect/abstract/singularity_pull(atom/singularity, current_size) return /obj/effect/abstract/singularity_act() @@ -59,7 +59,7 @@ /obj/effect/abstract/has_gravity(turf/gravity_turf) return FALSE -/obj/effect/dummy/singularity_pull() +/obj/effect/dummy/singularity_pull(atom/singularity, current_size) return /obj/effect/dummy/singularity_act() diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 60ce9d7662b..dc51e5079f4 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -14,7 +14,7 @@ if(initial_duration > 0 SECONDS) QDEL_IN(src, initial_duration) -/obj/effect/forcefield/singularity_pull() +/obj/effect/forcefield/singularity_pull(atom/singularity, current_size) return /// The wizard's forcefield, summoned by forcewall diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index b1a4a75c945..5efb41e6029 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -11,7 +11,7 @@ /obj/effect/landmark/singularity_act() return -/obj/effect/landmark/singularity_pull() +/obj/effect/landmark/singularity_pull(atom/singularity, current_size) return INITIALIZE_IMMEDIATE(/obj/effect/landmark) diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 075e927d653..f5021385524 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -15,7 +15,7 @@ /obj/effect/beam/singularity_act() return -/obj/effect/beam/singularity_pull() +/obj/effect/beam/singularity_pull(atom/singularity, current_size) return /obj/effect/spawner diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 24fae3f6139..b90ebe54ffa 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -4,7 +4,7 @@ /obj/effect/overlay/singularity_act() return -/obj/effect/overlay/singularity_pull() +/obj/effect/overlay/singularity_pull(atom/singularity, current_size) return /obj/effect/overlay/beam//Not actually a projectile, just an effect. diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index a43fee5608d..18f63350426 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -113,7 +113,7 @@ playsound(loc, SFX_PORTAL_CLOSE, 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) qdel(src) -/obj/effect/portal/singularity_pull() +/obj/effect/portal/singularity_pull(atom/singularity, current_size) return /obj/effect/portal/singularity_act() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 68a49b8a303..31ca55a54fb 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -31,7 +31,7 @@ /obj/effect/step_trigger/singularity_act() return -/obj/effect/step_trigger/singularity_pull() +/obj/effect/step_trigger/singularity_pull(atom/singularity, current_size) return /* Sends a message to mob when triggered*/ diff --git a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm index 81c854f2c3e..2d112aa2059 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm @@ -7,7 +7,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT appearance_flags = LONG_GLIDE -/obj/effect/projectile/singularity_pull() +/obj/effect/projectile/singularity_pull(atom/singularity, current_size) return /obj/effect/projectile/singularity_act() diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 9669b4ed290..a4c94104e1e 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -25,7 +25,7 @@ /obj/effect/temp_visual/singularity_act() return -/obj/effect/temp_visual/singularity_pull() +/obj/effect/temp_visual/singularity_pull(atom/singularity, current_size) return /obj/effect/temp_visual/dir_setting diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fe3441dd02b..eb1f54feb25 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -834,10 +834,10 @@ /obj/item/proc/IsReflect(def_zone) return FALSE -/obj/item/singularity_pull(S, current_size) +/obj/item/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FOUR) - throw_at(S,14,3, spin=0) + throw_at(singularity, 14, 3, spin=0) else return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index c51adf91b3b..7c8173fae36 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -121,12 +121,12 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) SEND_SIGNAL(src, COMSIG_ATOM_UI_INTERACT, user) ui_interact(user) -/obj/singularity_pull(S, current_size) +/obj/singularity_pull(atom/singularity, current_size) ..() if(move_resist == INFINITY) return if(!anchored || current_size >= STAGE_FIVE) - step_towards(src,S) + step_towards(src, singularity) /obj/get_dumping_location() return get_turf(src) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index ffe4ea44a00..17f81eb2428 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -79,7 +79,7 @@ icon_state = "ladder[up ? 1 : 0][down ? 1 : 0]" return ..() -/obj/structure/ladder/singularity_pull() +/obj/structure/ladder/singularity_pull(atom/singularity, current_size) if (!(resistance_flags & INDESTRUCTIBLE)) visible_message(span_danger("[src] is torn to pieces by the gravitational pull!")) qdel(src) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 0b553261300..a0cf53487cf 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -82,7 +82,7 @@ return TRUE return FALSE -/obj/structure/lattice/singularity_pull(S, current_size) +/obj/structure/lattice/singularity_pull(atom/singularity, current_size) if(current_size >= STAGE_FOUR) deconstruct() diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index e0852b0fd39..5518375de68 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -27,7 +27,7 @@ P.deconstruct(FALSE) return ..() -/obj/structure/transit_tube/singularity_pull(S, current_size) +/obj/structure/transit_tube/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 6522a2125fe..a35915d6f00 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -63,7 +63,7 @@ if(EXPLODE_LIGHT) SSexplosions.low_mov_atom += contents -/obj/structure/transit_tube_pod/singularity_pull(S, current_size) +/obj/structure/transit_tube_pod/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0d5fc1e5c5d..b3a3ea31038 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -117,7 +117,7 @@ /obj/structure/window/narsie_act() add_atom_colour(NARSIE_WINDOW_COLOUR, FIXED_COLOUR_PRIORITY) -/obj/structure/window/singularity_pull(S, current_size) +/obj/structure/window/singularity_pull(atom/singularity, current_size) ..() if(anchored && current_size >= STAGE_TWO) set_anchored(FALSE) diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index df15a8ef303..c656d0ee95a 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -247,7 +247,7 @@ return FALSE -/turf/closed/wall/singularity_pull(S, current_size) +/turf/closed/wall/singularity_pull(atom/singularity, current_size) ..() wall_singularity_pull(current_size) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index c3ea3694043..cad574eb4ec 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -175,7 +175,7 @@ return null return new floor_tile(src) -/turf/open/floor/singularity_pull(S, current_size) +/turf/open/floor/singularity_pull(atom/singularity, current_size) ..() var/sheer = FALSE switch(current_size) diff --git a/code/game/turfs/open/floor/reinforced_floor.dm b/code/game/turfs/open/floor/reinforced_floor.dm index dcba9ed3667..78b6e5a803e 100644 --- a/code/game/turfs/open/floor/reinforced_floor.dm +++ b/code/game/turfs/open/floor/reinforced_floor.dm @@ -75,7 +75,7 @@ return TRUE -/turf/open/floor/engine/singularity_pull(S, current_size) +/turf/open/floor/engine/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) if(floor_tile) diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index 1a9f24ce50e..fa0b0c4b128 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -175,7 +175,7 @@ /turf/open/lava/singularity_act() return -/turf/open/lava/singularity_pull(S, current_size) +/turf/open/lava/singularity_pull(atom/singularity, current_size) return /turf/open/lava/GetHeatCapacity() diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index c68baa32e4e..9f1d430a46c 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -30,7 +30,7 @@ /obj/effect/sound_emitter/singularity_act() return -/obj/effect/sound_emitter/singularity_pull() +/obj/effect/sound_emitter/singularity_pull(atom/singularity, current_size) return /obj/effect/sound_emitter/examine(mob/user) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 5aae2a6ccbc..d2269c19dff 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -215,5 +215,5 @@ /obj/effect/gateway/singularity_act() return -/obj/effect/gateway/singularity_pull() +/obj/effect/gateway/singularity_pull(atom/singularity, current_size) return diff --git a/code/modules/antagonists/cult/cult_turf_overlay.dm b/code/modules/antagonists/cult/cult_turf_overlay.dm index e2324b5f933..df92d7aec90 100644 --- a/code/modules/antagonists/cult/cult_turf_overlay.dm +++ b/code/modules/antagonists/cult/cult_turf_overlay.dm @@ -15,7 +15,7 @@ /obj/effect/cult_turf/singularity_act() return -/obj/effect/cult_turf/singularity_pull() +/obj/effect/cult_turf/singularity_pull(atom/singularity, current_size) return /obj/effect/cult_turf/Destroy() diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 4bfb1d7aed4..ef2a40636d0 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -73,7 +73,7 @@ /obj/effect/rend/singularity_act() return -/obj/effect/rend/singularity_pull() +/obj/effect/rend/singularity_pull(atom/singularity, current_size) return /obj/item/veilrender/vealrender diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 00bb94d6bc3..47a2af4651c 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -302,7 +302,7 @@ var/mob/living/immolated = arrived immolated.fire_act(temperature, volume) -/obj/effect/hotspot/singularity_pull() +/obj/effect/hotspot/singularity_pull(atom/singularity, current_size) return #undef INSUFFICIENT diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 186ef8ea9aa..9d46a73e16c 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -560,7 +560,7 @@ L.ventcrawl_layer = piping_layer return ..() -/obj/machinery/atmospherics/singularity_pull(S, current_size) +/obj/machinery/atmospherics/singularity_pull(atom/singularity, current_size) if(current_size >= STAGE_FIVE) deconstruct(FALSE) return ..() diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 97bff1ddaea..cee96ae0ee7 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -152,7 +152,7 @@ else to_chat(user, status()) -/obj/machinery/meter/singularity_pull(S, current_size) +/obj/machinery/meter/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/events/immovable_rod/immovable_rod.dm b/code/modules/events/immovable_rod/immovable_rod.dm index e1f0ada0e60..d73adf8ed75 100644 --- a/code/modules/events/immovable_rod/immovable_rod.dm +++ b/code/modules/events/immovable_rod/immovable_rod.dm @@ -145,7 +145,7 @@ /obj/effect/immovablerod/singularity_act() return -/obj/effect/immovablerod/singularity_pull() +/obj/effect/immovablerod/singularity_pull(atom/singularity, current_size) return /obj/effect/immovablerod/Process_Spacemove(movement_dir = 0, continuous_move = FALSE) diff --git a/code/modules/hallucination/_hallucination.dm b/code/modules/hallucination/_hallucination.dm index 9e23a656802..b3f33fc3191 100644 --- a/code/modules/hallucination/_hallucination.dm +++ b/code/modules/hallucination/_hallucination.dm @@ -197,7 +197,7 @@ return regenerate_image() -/obj/effect/client_image_holder/singularity_pull() +/obj/effect/client_image_holder/singularity_pull(atom/singularity, current_size) return /obj/effect/client_image_holder/singularity_act() diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index 7fda1df5951..6baaf8e5660 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -57,7 +57,7 @@ qdel(sight_blocker) return ..() -/obj/structure/necropolis_gate/singularity_pull() +/obj/structure/necropolis_gate/singularity_pull(atom/singularity, current_size) return 0 /obj/structure/necropolis_gate/CanAllowThrough(atom/movable/mover, border_dir) @@ -88,7 +88,7 @@ opacity = TRUE anchored = TRUE -/obj/structure/opacity_blocker/singularity_pull() +/obj/structure/opacity_blocker/singularity_pull(atom/singularity, current_size) return FALSE //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -242,7 +242,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) AddComponent(/datum/component/seethrough, SEE_THROUGH_MAP_DEFAULT_TWO_TALL) -/obj/structure/necropolis_arch/singularity_pull() +/obj/structure/necropolis_arch/singularity_pull(atom/singularity, current_size) return 0 //stone tiles for boss arenas @@ -266,7 +266,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) give_turf_traits = string_list(list(TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED)) AddElement(/datum/element/give_turf_traits, give_turf_traits) -/obj/structure/stone_tile/singularity_pull() +/obj/structure/stone_tile/singularity_pull(atom/singularity, current_size) return /obj/structure/stone_tile/block diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 1ef2f778bc5..7092c8c0f76 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/effect/extraction_holder/singularity_act() return -/obj/effect/extraction_holder/singularity_pull() +/obj/effect/extraction_holder/singularity_pull(atom/singularity, current_size) return /obj/item/extraction_pack/syndicate diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 7acc0299f10..02156684afa 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -453,7 +453,7 @@ // but regardless block all relayed moves, because no, you cannot move in the void. return -/obj/effect/immortality_talisman/singularity_pull() +/obj/effect/immortality_talisman/singularity_pull(atom/singularity, current_size) return /obj/effect/immortality_talisman/void diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index aaf127bf8b5..798ec58cd1e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -13,7 +13,7 @@ . = ..() set_light(set_luminosity, set_cap) -/obj/effect/light_emitter/singularity_pull() +/obj/effect/light_emitter/singularity_pull(atom/singularity, current_size) return /obj/effect/light_emitter/singularity_act() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9fcb4083f30..462b9b8e331 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -488,13 +488,13 @@ underwear = "Nude" update_body(is_creating = TRUE) -/mob/living/carbon/human/singularity_pull(S, current_size) +/mob/living/carbon/human/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_THREE) for(var/obj/item/hand in held_items) if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && dropItemToGround(hand)) step_towards(hand, src) - to_chat(src, span_warning("\The [S] pulls \the [hand] from your grip!")) + to_chat(src, span_warning("\The [singularity] pulls \the [hand] from your grip!")) #define CPR_PANIC_SPEED (0.8 SECONDS) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9265241ea00..d1a0819bcda 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1282,14 +1282,14 @@ animate(src, transform = flipped_matrix, pixel_y = pixel_y-4, time = 0.5 SECONDS, easing = EASE_OUT) base_pixel_y -= 4 -/mob/living/singularity_pull(S, current_size) +/mob/living/singularity_pull(atom/singularity, current_size) ..() if(move_resist == INFINITY) return if(current_size >= STAGE_SIX) //your puny magboots/wings/whatever will not save you against supermatter singularity - throw_at(S, 14, 3, src, TRUE) + throw_at(singularity, 14, 3, src, TRUE) else if(!src.mob_negates_gravity()) - step_towards(src,S) + step_towards(src, singularity) /mob/living/proc/get_temperature(datum/gas_mixture/environment) var/loc_temp = environment ? environment.temperature : T0C diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index 522ddf57501..c14825bf3c7 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -421,7 +421,7 @@ /obj/structure/chrono_field/singularity_act() return -/obj/structure/chrono_field/singularity_pull() +/obj/structure/chrono_field/singularity_pull(atom/singularity, current_size) return /obj/structure/chrono_field/ex_act() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index fdfab1fed84..a4cab5f9910 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list( else return FALSE -/obj/structure/cable/singularity_pull(S, current_size) +/obj/structure/cable/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 47000049047..a042c3c8cd6 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -154,7 +154,7 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/pipe_cleaner/attackby(obj/item/W, mob/user, params) handlecable(W, user, params) -/obj/structure/pipe_cleaner/singularity_pull(S, current_size) +/obj/structure/pipe_cleaner/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d36b66eac7f..355221eab86 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -197,7 +197,7 @@ wound_bonus = -40 bare_wound_bonus = 70 -/obj/projectile/beam/emitter/singularity_pull() +/obj/projectile/beam/emitter/singularity_pull(atom/singularity, current_size) return //don't want the emitters to miss /obj/projectile/beam/emitter/hitscan diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm index ae05a9eb85d..db3805c6ba8 100644 --- a/code/modules/projectiles/projectile/energy/net_snare.dm +++ b/code/modules/projectiles/projectile/energy/net_snare.dm @@ -52,7 +52,7 @@ /obj/effect/nettingportal/singularity_act() return -/obj/effect/nettingportal/singularity_pull() +/obj/effect/nettingportal/singularity_pull(atom/singularity, current_size) return /obj/item/dragnet_beacon diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 1d1354e865d..e23bfc8d0a3 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -96,7 +96,7 @@ stored = null deconstruct(FALSE) -/obj/machinery/disposal/singularity_pull(S, current_size) +/obj/machinery/disposal/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index b08323e66e4..ace39e55c8a 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -189,7 +189,7 @@ pipe.setDir(dir) spew_forth() -/obj/structure/disposalpipe/singularity_pull(S, current_size) +/obj/structure/disposalpipe/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index bf6e81a9557..b853d949d46 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -73,7 +73,7 @@ /obj/docking_port/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) return -/obj/docking_port/singularity_pull() +/obj/docking_port/singularity_pull(atom/singularity, current_size) return /obj/docking_port/singularity_act() diff --git a/code/modules/spells/spell_types/self/spacetime_distortion.dm b/code/modules/spells/spell_types/self/spacetime_distortion.dm index 976d83e8a30..80cb605cb47 100644 --- a/code/modules/spells/spell_types/self/spacetime_distortion.dm +++ b/code/modules/spells/spell_types/self/spacetime_distortion.dm @@ -115,7 +115,7 @@ /obj/effect/cross_action/singularity_act() return -/obj/effect/cross_action/singularity_pull() +/obj/effect/cross_action/singularity_pull(atom/singularity, current_size) return /obj/effect/cross_action/spacetime_dist/Initialize(mapload, flags = MAGIC_RESISTANCE) diff --git a/code/modules/transport/tram/tram_structures.dm b/code/modules/transport/tram/tram_structures.dm index bdea433a9c9..346cb5e6802 100644 --- a/code/modules/transport/tram/tram_structures.dm +++ b/code/modules/transport/tram/tram_structures.dm @@ -145,7 +145,7 @@ /obj/structure/tram/narsie_act() add_atom_colour(NARSIE_WINDOW_COLOUR, FIXED_COLOUR_PRIORITY) -/obj/structure/tram/singularity_pull(singulo, current_size) +/obj/structure/tram/singularity_pull(atom/singularity, current_size) ..() if(current_size >= STAGE_FIVE) diff --git a/code/modules/visuals/render_steps.dm b/code/modules/visuals/render_steps.dm index e29436596c6..e9cfbf3b556 100644 --- a/code/modules/visuals/render_steps.dm +++ b/code/modules/visuals/render_steps.dm @@ -29,7 +29,7 @@ /atom/movable/render_step/singularity_act() return -/atom/movable/render_step/singularity_pull() +/atom/movable/render_step/singularity_pull(atom/singularity, current_size) return /atom/movable/render_step/blob_act()