diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 11e7f75f4b0..4e467e4eb18 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -431,5 +431,5 @@ animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3) -atom/movable/proc/portal_destroyed(obj/effect/portal/P) +/atom/movable/proc/portal_destroyed(obj/effect/portal/P) return diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm index dcd7724a94a..668bb52b467 100644 --- a/code/game/objects/effects/spawners/random_spawners.dm +++ b/code/game/objects/effects/spawners/random_spawners.dm @@ -198,7 +198,7 @@ /obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/mask/gas/syndicate = 1, /obj/item/suppressor = 1, - /obj/item/coin/syndicate = 1, + /obj/item/coin/antagtoken/syndicate = 1, /obj/item/storage/box/syndie_kit/cutouts = 1) /obj/effect/spawner/random_spawners/syndicate/loot/level2 diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index ca2570df513..b0ca9999c44 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -20,8 +20,9 @@ ..() /obj/structure/fusionreactor/ex_act(severity) - obj_integrity -= 10 * severity - healthcheck() + if(severity < 3) + obj_integrity = 0 + healthcheck() /obj/structure/fusionreactor/bullet_act(obj/item/projectile/Proj) obj_integrity -= Proj.damage @@ -64,7 +65,6 @@ var/beepsound = 'sound/items/timer.ogg' var/deliberate = FALSE var/max_cycles = 10 - var/max_fire_range = 6 var/area/syndicate_depot/depotarea /obj/effect/overload/Initialize() @@ -83,9 +83,7 @@ if(!deliberate) playsound(loc, beepsound, 50, 0) cycles++ - var/fire_range = cycles - if(max_fire_range > 6) - max_fire_range = 6 + var/fire_range = min(cycles, 6) for(var/turf/simulated/turf in range(fire_range, T)) new /obj/effect/hotspot(turf) diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index f0bc6677e77..96fc0aa2e7f 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -87,16 +87,17 @@ sideslist = list("heads") credits = 20 -/obj/item/coin/syndicate - name = "syndicate coin" +/obj/item/coin/antagtoken + name = "antag token" icon_state = "coin_valid_valid" cmineral = "valid" desc = "A novelty coin that helps the heart know what hard evidence cannot prove." sideslist = list("valid", "salad") - credits = 160 + credits = 20 -/obj/item/coin/antagtoken/New() - return +/obj/item/coin/antagtoken/syndicate + name = "syndicate coin" + credits = 160 /obj/item/coin/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/stack/cable_coil)) diff --git a/code/modules/mob/living/silicon/decoy/death.dm b/code/modules/mob/living/silicon/decoy/death.dm index 7a979f3ad4c..624343af464 100644 --- a/code/modules/mob/living/silicon/decoy/death.dm +++ b/code/modules/mob/living/silicon/decoy/death.dm @@ -4,7 +4,7 @@ stat = DEAD icon_state = "ai-crash" for(var/obj/machinery/ai_status_display/O in world) //change status - if(O.z == z) + if(atoms_share_level(O, src)) O.mode = 2 ..(0) gib() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index b1e5f13f7da..278fa1aff54 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -4,7 +4,7 @@ icon_state = "ai" anchored = 1 // -- TLE canmove = 0 - a_intent = "harm" // This is apparently the only thing that stops other mobs walking through them as if they were thin air. + a_intent = INTENT_HARM // This is apparently the only thing that stops other mobs walking through them as if they were thin air. /mob/living/silicon/decoy/New() src.icon = 'icons/mob/AI.dmi' @@ -15,6 +15,7 @@ /mob/living/silicon/decoy/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/aicard)) user.visible_message("[user] cannot find an intellicard slot on [src].") + return TRUE else return ..()