Merge pull request #9601 from Ghommie/Ghommie-cit265

Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
parent cf9c3a65fd 072eca6ec0
commit 088e586b47
121 changed files with 550 additions and 426 deletions
@@ -23,6 +23,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	desc = "A device which produces a graviton field when set up."
 	icon = 'icons/obj/machines/gravity_generator.dmi'
 	density = TRUE
+	move_resist = INFINITY
 	use_power = NO_POWER_USE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/sprite_number = 0
@@ -756,7 +756,7 @@
 /obj/item/light/bulb/broken
 	status = LIGHT_BROKEN

-/obj/item/light/throw_impact(atom/hit_atom)
+/obj/item/light/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	if(!..()) //not caught by a mob
 		shatter()

@@ -6,6 +6,7 @@
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "Contain_F"
 	density = FALSE
+	move_resist = INFINITY
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	use_power = NO_POWER_USE
 	interaction_flags_atom = NONE
@@ -245,6 +245,7 @@ field_generator power level display
 	if(state != FG_WELDED || !anchored)
 		turn_off()
 		return
+	move_resist = INFINITY
 	spawn(1)
 		setup_field(1)
 	spawn(2)
@@ -335,6 +336,7 @@ field_generator power level display
 					message_admins("A singulo exists and a containment field has failed at [ADMIN_VERBOSEJMP(T)].")
 					investigate_log("has <font color='red'>failed</font> whilst a singulo exists at [AREACOORD(T)].", INVESTIGATE_SINGULO)
 			O.last_warning = world.time
+	move_resist = initial(move_resist)

 /obj/machinery/field/generator/shock(mob/living/user)
 	if(fields.len)
@@ -7,6 +7,7 @@
 	icon_state = "singularity_s1"
 	anchored = TRUE
 	density = TRUE
+	move_resist = INFINITY
 	layer = MASSIVE_OBJ_LAYER
 	light_range = 6
 	appearance_flags = 0