diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index be7037295497..db0702200d16 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -27,7 +27,6 @@ var/unique = TRUE - var/has_gravity = 1 // var/list/lights // list of all lights on this area var/list/all_doors = list() //Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area var/air_doors_activated = 0 @@ -381,42 +380,6 @@ if(istype(M)) use_power(-M.calculate_current_power_usage(), M.power_channel) -/area/proc/gravitychange(gravitystate = 0, area/A) - - A.has_gravity = gravitystate - - if(gravitystate) - for(var/mob/living/carbon/human/M in A) - thunk(M) - for(var/mob/M1 in A) - M1.make_floating(0) - else - for(var/mob/M in A) - if(M.Check_Dense_Object() && istype(src,/mob/living/carbon/human/)) - var/mob/living/carbon/human/H = src - if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING)) //magboots + dense_object = no floaty effect - H.make_floating(0) - else - H.make_floating(1) - else - M.make_floating(1) - -/area/proc/thunk(M) - if(istype(get_turf(M), /turf/open/space)) // Can't fall onto nothing. - return - - if(istype(M,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. - var/mob/living/carbon/human/H = M - if((istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING))) - return - H.adjust_effect(5, STUN) - H.adjust_effect(5, WEAKEN) - - to_chat(M, "Gravity!") - - - - //atmos related procs /area/return_air() diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index df5e54a77013..6b3084ba8068 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -59,7 +59,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = FALSE static_lighting = FALSE base_lighting_alpha = 255 - has_gravity = 1 // === end remove @@ -72,7 +71,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station statistic_exempt = TRUE ceiling = CEILING_METAL - base_lighting_alpha = 255 + base_lighting_alpha = 255 /area/centcom/control name = "\improper abandoned Centcom Control" diff --git a/code/game/objects/items/tools/extinguisher.dm b/code/game/objects/items/tools/extinguisher.dm index 723d34c64f7e..75987116b290 100644 --- a/code/game/objects/items/tools/extinguisher.dm +++ b/code/game/objects/items/tools/extinguisher.dm @@ -159,7 +159,7 @@ unpicked_targets -= TT INVOKE_ASYNC(src, PROC_REF(release_liquid), TT, user) - if(istype(user.loc, /turf/open/space) || (user.lastarea && user.lastarea.has_gravity == 0)) + if(istype(user.loc, /turf/open/space)) user.inertia_dir = get_dir(target, user) step(user, user.inertia_dir) return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 36d2518d7e75..7c24203d4c9f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -379,7 +379,7 @@ if(!lastarea) lastarea = get_area(src.loc) - if((istype(loc, /turf/open/space)) || !lastarea.has_gravity) + if(istype(loc, /turf/open/space)) inertia_dir = get_dir(target, src) step(src, inertia_dir) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index e326ce9e45b3..06e7fe401e16 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -261,12 +261,12 @@ if(istype(src,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. var/mob/living/carbon/human/H = src - if((istype(turf,/turf/open/floor)) && (src.lastarea.has_gravity == 0) && !(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING))) + if((istype(turf,/turf/open/floor)) && !(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING))) continue else - if((istype(turf,/turf/open/floor)) && (src.lastarea && src.lastarea.has_gravity == 0)) // No one else gets a chance. + if(istype(turf,/turf/open/floor)) // No one else gets a chance. continue