coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #49399 from AnturK/512begone

Browse Source 
Drops 512 support.
This commit is contained in:
ShizCalev
2020-02-17 22:52:47 -05:00
committed by GitHub
parent 4c75a30ab4 a1392847bd
commit fcf32c3d2d
59 changed files with 74 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
-8
View File
@@ -482,14 +482,6 @@
temp_expression_list = list()
i = expression(i, temp_expression_list)
#if MIN_COMPILER_VERSION > 512
#warn Remove this outdated workaround
#elif DM_BUILD < 1467
// http://www.byond.com/forum/post/2445083
var/dummy = src.type
dummy = dummy
#endif
while(token(i) && token(i) != "]")
if (temp_expression_list)
code/modules/antagonists/blob/structures/_blob.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/structure/blob/CanAStarPass(ID, dir, caller)
. = 0
if(ismovableatom(caller))
if(ismovable(caller))
var/atom/movable/mover = caller
. = . || (mover.pass_flags & PASSBLOB)
code/modules/buildmode/submodes/copy.dm
+1 -1
View File
@@ -23,6 +23,6 @@
DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T)
log_admin("Build Mode: [key_name(c)] copied [stored] to [AREACOORD(object)]")
else if(right_click)
if(ismovableatom(object)) // No copying turfs for now.
if(ismovable(object)) // No copying turfs for now.
to_chat(c, "<span class='notice'>[object] set as template.</span>")
stored = object
code/modules/events/wormholes.dm
+1 -1
View File
@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to
if(!(ismecha(M) && mech_sized))
return
if(ismovableatom(M))
if(ismovable(M))
if(GLOB.all_wormholes.len)
var/obj/effect/portal/wormhole/P = pick(GLOB.all_wormholes)
if(P && isturf(P.loc))
code/modules/lighting/lighting_atom.dm
+1 -1
View File
@@ -38,7 +38,7 @@
if (!light_power || !light_range) // We won't emit light anyways, destroy the light source.
QDEL_NULL(light)
else
if (!ismovableatom(loc)) // We choose what atom should be the top atom of the light here.
if (!ismovable(loc)) // We choose what atom should be the top atom of the light here.
. = src
else
. = loc
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -429,7 +429,7 @@
/obj/projectile/hook/on_hit(atom/target)
. = ..()
if(ismovableatom(target))
if(ismovable(target))
var/atom/movable/A = target
if(A.anchored)
return
code/modules/mob/living/living.dm
+1 -1
View File
@@ -70,7 +70,7 @@
var/obj/O = A
if(ObjBump(O))
return
if(ismovableatom(A))
if(ismovable(A))
var/atom/movable/AM = A
if(PushAM(AM, move_force))
return
code/modules/mob/living/say.dm
-4
View File
@@ -200,11 +200,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
spans |= L.spans
if(message_mode == MODE_SING)
#if DM_VERSION < 513
var/randomnote = "~"
#else
var/randomnote = pick("\u2669", "\u266A", "\u266B")
#endif
spans |= SPAN_SINGING
message = "[randomnote] [message] [randomnote]"
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -901,7 +901,7 @@
if(istype(A, /obj/machinery/camera))
current = A
if(client)
if(ismovableatom(A))
if(ismovable(A))
if(A != GLOB.ai_camera_room_landmark)
end_multicam()
client.perspective = EYE_PERSPECTIVE
code/modules/mob/living/simple_animal/hostile/alien.dm
+1 -1
View File
@@ -176,7 +176,7 @@
AddElement(/datum/element/cleaning)
/mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
if(ismovableatom(target))
if(ismovable(target))
if(istype(target, /obj/effect/decal/cleanable))
visible_message("<span class='notice'>[src] cleans up \the [target].</span>")
qdel(target)
code/modules/mob/mob.dm
+1 -1
View File
@@ -364,7 +364,7 @@
/mob/proc/reset_perspective(atom/A)
if(client)
if(A)
if(ismovableatom(A))
if(ismovable(A))
//Set the the thing unless it's us
if(A != src)
client.perspective = EYE_PERSPECTIVE
code/modules/photography/camera/camera_image_capturing.dm
+2 -2
View File
@@ -5,7 +5,7 @@
if(istype(A))
appearance = A.appearance
dir = A.dir
if(ismovableatom(A))
if(ismovable(A))
var/atom/movable/AM = A
step_x = AM.step_x
step_y = AM.step_y
@@ -72,7 +72,7 @@
for(var/atom/A in sorted)
var/xo = (A.x - center.x) * world.icon_size + A.pixel_x + xcomp
var/yo = (A.y - center.y) * world.icon_size + A.pixel_y + ycomp
if(ismovableatom(A))
if(ismovable(A))
var/atom/movable/AM = A
xo += AM.step_x
yo += AM.step_y
code/modules/power/singularity/narsie.dm
+1 -1
View File
@@ -218,7 +218,7 @@
// if(defer_powernet_rebuild != 2)
// defer_powernet_rebuild = 1
for(var/atom/X in urange(consume_range,src,1))
if(isturf(X) || ismovableatom(X))
if(isturf(X) || ismovable(X))
consume(X)
// if(defer_powernet_rebuild != 2)
// defer_powernet_rebuild = 0
code/modules/power/solar.dm
-5
View File
@@ -26,10 +26,8 @@
/obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S)
. = ..()
panel = new()
#if DM_VERSION >= 513
panel.vis_flags = VIS_INHERIT_ID|VIS_INHERIT_ICON|VIS_INHERIT_PLANE
vis_contents += panel
#endif
panel.icon = icon
panel.icon_state = "solar_panel"
panel.layer = FLY_LAYER
@@ -116,9 +114,6 @@
panel.icon_state = "solar_panel-b"
else
panel.icon_state = "solar_panel"
#if DM_VERSION <= 512
. += new /mutable_appearance(panel)
#endif
/obj/machinery/power/solar/proc/queue_turn(azimuth)
needs_to_turn = TRUE
code/modules/projectiles/guns/misc/beam_rifle.dm
+1 -1
View File
@@ -464,7 +464,7 @@
else
target.ex_act(EXPLODE_HEAVY)
return TRUE
if(ismovableatom(target))
if(ismovable(target))
var/atom/movable/AM = target
if(AM.density && !AM.CanPass(src, get_turf(target)) && !ismob(AM))
if(structure_pierce < structure_pierce_amount)
code/modules/projectiles/projectile/bullets/shotgun.dm
+1 -1
View File
@@ -36,7 +36,7 @@
/obj/projectile/bullet/shotgun_meteorslug/on_hit(atom/target, blocked = FALSE)
. = ..()
if(ismovableatom(target))
if(ismovable(target))
var/atom/movable/M = target
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.safe_throw_at(throw_target, 3, 2)
code/modules/reagents/chemistry/reagents/drug_reagents.dm
+9 -9
View File
@@ -199,7 +199,7 @@
. = 1
/datum/reagent/drug/methamphetamine/overdose_process(mob/living/M)
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i in 1 to 4)
step(M, pick(GLOB.cardinals))
if(prob(20))
@@ -226,7 +226,7 @@
..()
/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M)
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 4, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(15)
@@ -236,7 +236,7 @@
..()
/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M)
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(20)
@@ -281,7 +281,7 @@
M.adjustStaminaLoss(-5, 0)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4)
M.hallucination += 5
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
step(M, pick(GLOB.cardinals))
step(M, pick(GLOB.cardinals))
..()
@@ -289,7 +289,7 @@
/datum/reagent/drug/bath_salts/overdose_process(mob/living/M)
M.hallucination += 5
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i in 1 to 8)
step(M, pick(GLOB.cardinals))
if(prob(20))
@@ -300,7 +300,7 @@
/datum/reagent/drug/bath_salts/addiction_act_stage1(mob/living/M)
M.hallucination += 10
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(5)
@@ -311,7 +311,7 @@
/datum/reagent/drug/bath_salts/addiction_act_stage2(mob/living/M)
M.hallucination += 20
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 8, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(10)
@@ -323,7 +323,7 @@
/datum/reagent/drug/bath_salts/addiction_act_stage3(mob/living/M)
M.hallucination += 30
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 12, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(15)
@@ -335,7 +335,7 @@
/datum/reagent/drug/bath_salts/addiction_act_stage4(mob/living/carbon/human/M)
M.hallucination += 30
if((M.mobility_flags & MOBILITY_MOVE) && !ismovableatom(M.loc))
if((M.mobility_flags & MOBILITY_MOVE) && !ismovable(M.loc))
for(var/i = 0, i < 16, i++)
step(M, pick(GLOB.cardinals))
M.Jitter(50)
code/modules/recycling/sortingmachinery.dm
+1 -1
View File
@@ -82,7 +82,7 @@
return ..()
/obj/structure/bigDelivery/relay_container_resist(mob/living/user, obj/O)
if(ismovableatom(loc))
if(ismovable(loc))
var/atom/movable/AM = loc //can't unwrap the wrapped container if it's inside something.
AM.relay_container_resist(user, O)
return
code/modules/vehicles/speedbike.dm
+1 -1
View File
@@ -71,7 +71,7 @@
if(A.density && has_buckled_mobs())
var/atom/throw_target = get_edge_target_turf(A, dir)
if(crash_all)
if(ismovableatom(A))
if(ismovable(A))
var/atom/movable/AM = A
AM.throw_at(throw_target, 4, 3)
visible_message("<span class='danger'>[src] crashes into [A]!</span>")