From c9cd134132e5e63bd4b79e0698593f31d808d028 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:39:30 -0700 Subject: [PATCH 1/2] linter fix --- code/datums/components/knockback.dm | 2 +- code/game/objects/objs.dm | 3 --- .../simple_animal/hostile/megafauna/demonic_frost_miner.dm | 1 + .../mob/living/simple_animal/hostile/megafauna/wendigo.dm | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/datums/components/knockback.dm b/code/datums/components/knockback.dm index 9c4cccd924..bd0d5ae352 100644 --- a/code/datums/components/knockback.dm +++ b/code/datums/components/knockback.dm @@ -60,4 +60,4 @@ throw_dir = turn(throw_dir, 180) throw_distance *= -1 var/atom/throw_target = get_edge_target_turf(throwee, throw_dir) - throwee.safe_throw_at(throw_target, throw_distance, 1, thrower, gentle = throw_gentle) + throwee.safe_throw_at(throw_target, throw_distance, 1, thrower) //, gentle = throw_gentle) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6b50df97dc..d2d72193b7 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -314,6 +314,3 @@ current_skin = choice icon_state = unique_reskin[choice] to_chat(M, "[src] is now skinned as '[choice]'.") - -/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user, reinforced) - return diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 67ea32b7d4..3d106021de 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -354,6 +354,7 @@ Difficulty: Extremely Hard return COMPONENT_MOVABLE_BLOCK_PRE_MOVE /datum/status_effect/ice_block_talisman/on_remove() + . = ..() if(!owner.stat) to_chat(owner, "The cube melts!") owner.cut_overlay(cube) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 89693b0ffc..8eadf08abb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -129,7 +129,7 @@ Difficulty: Hard continue to_chat(L, "[src]'s ground slam shockwave sends you flying!") var/turf/thrownat = get_ranged_target_turf_direct(src, L, 8, rand(-10, 10)) - L.throw_at(thrownat, 8, 2, src, TRUE, force = MOVE_FORCE_OVERPOWERING, gentle = TRUE) + L.throw_at(thrownat, 8, 2, src, TRUE) //, force = MOVE_FORCE_OVERPOWERING, gentle = TRUE) L.apply_damage(20, BRUTE) shake_camera(L, 2, 1) all_turfs -= T From 270f5ed168944bdc9b734babad4bbbe1af7e85eb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 30 Apr 2020 18:15:43 -0700 Subject: [PATCH 2/2] fix --- _maps/map_files/BoxStation/BoxStation.dmm | 3 +-- _maps/map_files/CogStation/CogStation.dmm | 16 ++++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9c2a1a2883..60e4d767cc 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -46703,8 +46703,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index dbc857dfd7..ebb3493a35 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -10400,7 +10400,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/door/window/eastright{ @@ -42089,18 +42088,14 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bMD" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0 - }, +/obj/structure/flora/tree/palm, /obj/machinery/light{ dir = 8 }, /turf/open/floor/grass, /area/medical/virology) "bME" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0 - }, +/obj/structure/flora/tree/palm, /obj/machinery/light{ dir = 4; light_color = "#c1caff" @@ -42181,9 +42176,7 @@ /turf/open/space/basic, /area/space/nearstation) "bML" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0 - }, +/obj/structure/flora/tree/palm, /turf/open/floor/grass, /area/medical/virology) "bMM" = ( @@ -71649,8 +71642,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/flasher{ id = "ID"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai)