[overmind.name] left [GLOB.infection_beacons.len] beacons in its destructive path." + . += point_report + +/datum/antagonist/infection/greet() + owner.current.playsound_local(get_turf(owner.current), 'sound/effects/blobattack.ogg',100,0) + owner.current.playsound_local(get_turf(owner.current), 'sound/effects/attackblob.ogg',100,0) + to_chat(owner,"You feel radiant.") + +/datum/antagonist/infection/on_gain() + create_objectives() + return ..() + +// Creates the mob for the infection commander and then returns the mob created +/datum/antagonist/infection/proc/create_mob_type(var/turf/spawnturf) + var/mob/camera/commander/C = new /mob/camera/commander(spawnturf) + return C + +// Adds the objectives for the antagonist to the mob +/datum/antagonist/infection/proc/create_objectives() + var/datum/objective/infection_takeover/main = new + main.owner = owner + objectives += main + +/datum/antagonist/infection/antag_listing_status() + . = ..() + if(owner && owner.current) + var/mob/I = owner.current + if(istype(I)) + . += "(Progress: [GLOB.infection_beacons.len])" + +/datum/objective/infection_takeover + explanation_text = "Destroy all of the beacons!" + +/datum/antagonist/infection/spore/roundend_report() + return + +/* + Creates the mob type for the infection spores, handles them specially if they're a roundstart spore + If the infection core exists they will instead be immediately moved there +*/ +/datum/antagonist/infection/spore/create_mob_type(var/turf/spawnturf) + var/mob/camera/commander/C = GLOB.infection_commander + return C.create_spore(FALSE) diff --git a/code/modules/antagonists/infection/beacon.dm b/code/modules/antagonists/infection/beacon.dm new file mode 100644 index 000000000000..5ff11501270c --- /dev/null +++ b/code/modules/antagonists/infection/beacon.dm @@ -0,0 +1,181 @@ +GLOBAL_LIST_EMPTY(infection_beacons) +GLOBAL_LIST_EMPTY(beacon_spawns) + +/obj/effect/landmark/beacon_start + name = "beaconstart" + icon_state = "beacon_start" + +/obj/effect/landmark/beacon_start/Initialize(mapload) + . = ..() + GLOB.beacon_spawns += src + +/obj/effect/landmark/beacon_start/west + name = "beaconstartwest" + dir = WEST + +/obj/effect/landmark/beacon_start/east + name = "beaconstarteast" + dir = EAST + +/obj/effect/landmark/beacon_start/north + name = "beaconstartnorth" + dir = NORTH + +/obj/effect/landmark/beacon_start/south + name = "beaconstartsouth" + dir = SOUTH + +/* + Beacons, infectious creatures and structures are completely unable to cross the barriers that these generate +*/ + +/obj/structure/beacon_generator + name = "bluespace causality anchor" + icon = 'icons/mob/infection/infection.dmi' + icon_state = "generator" + light_range = 4 + desc = "A bluespace causality anchor, it produces a barrier of bluespace energy capable of destroying any infestation that comes into contact with it. The built in causality shield is however vulnerable to being overcharged from direct attacks by infested nodes." + density = TRUE + anchored = TRUE + move_force = INFINITY + move_resist = INFINITY + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + layer = FLY_LAYER + max_integrity = 1000 + resistance_flags = INDESTRUCTIBLE + // Stores the walls that this beacon is generating, to be destroyed when the beacon is destroyed + var/list/walls = list() + +/obj/structure/beacon_generator/Initialize(mapload) + . = ..() + START_PROCESSING(SSobj,src) + GLOB.infection_beacons += src + update_icon() + +/obj/structure/beacon_generator/Destroy() + STOP_PROCESSING(SSobj,src) + for(var/obj/structure/beacon_wall/D in walls) + qdel(D) + GLOB.infection_beacons -= src + var/mob/camera/commander/C = GLOB.infection_commander + if(C) + C.upgrade_points++ + C.max_infection_points += 50 + C.infection_core.point_rate++ + C.add_points(C.max_infection_points) + to_chat(C, "With the destruction of a causality anchor the restrictions on your power have been lightened!") + for(var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/spore in C.infection_mobs) + spore.add_points(200) + to_chat(spore, "With the destruction of a causality anchor the restrictions on your power have been lightened!") + if(GLOB.infection_beacons.len > 0) + INVOKE_ASYNC(src, .proc/destroyed_announcement) + return ..() + +/* + Delayed announcement that occurs when the becaon has been destroyed +*/ +/obj/structure/beacon_generator/proc/destroyed_announcement(beacons_left = GLOB.infection_beacons.len) + sleep(80) + priority_announce("An anchor has been consumed by the infection, only [num2text(beacons_left)] remain[beacons_left == 1 ? "s" : ""].","CentCom Exotic Material Reseach Division", 'sound/misc/notice1.ogg') + +/obj/structure/beacon_generator/process() + obj_integrity = min(obj_integrity + 10, max_integrity) + update_icon() + +/obj/structure/beacon_generator/blob_act() + obj_integrity -= 50 + update_icon() + if(obj_integrity > 0) + playsound(src.loc, 'sound/effects/empulse.ogg', 300, 1, 10, pressure_affected = FALSE) + return + playsound(loc, 'sound/magic/repulse.ogg', 300, 1, 10, pressure_affected = FALSE) + var/mob/camera/commander/OM = GLOB.infection_commander + OM.playsound_local(OM, 'sound/magic/repulse.ogg', 300, 1) + explosion(src, -1, -1, 4, 10, FALSE, TRUE, 5, TRUE, FALSE) + for(var/obj/structure/infection/I in orange(10, src)) + if(istype(I, /obj/structure/infection/core)) + continue + qdel(I) + qdel(src) + +/obj/structure/beacon_generator/attack_animal(mob/living/simple_animal/M) + playsound(src, 'sound/effects/bang.ogg', 50, 1) + to_chat(M, "This is far too strong for you to destroy.") + . = ..() + +/obj/structure/beacon_generator/update_icon() + vis_contents.Cut() + var/obj/effect/overlay/vis/shield_overlay = new + shield_overlay.icon = 'icons/effects/effects.dmi' + shield_overlay.icon_state = "shield" + shield_overlay.layer = layer + shield_overlay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + var/matrix/M = matrix() + var/scale = (obj_integrity / max_integrity) * 3 + M.Scale(scale, scale) + shield_overlay.transform = M + vis_contents += shield_overlay + +/* + Creates the walls for the beacon generator. + They are generated 5 spaces behind the beacon and then extend out on opposite sides to the ends of the z level. + Essentially cutting off any infection creatures from passing the beacon without destroying it. +*/ +/obj/structure/beacon_generator/proc/generateWalls() + var/direction = dir + var/turf/from = get_ranged_target_turf(src, turn(direction, 180), 5) + var/turf/first = get_edge_target_turf(from, turn(direction, 90)) + var/turf/second = get_edge_target_turf(from, turn(direction, -90)) + var/list/firstside = getline(from, first) - from + var/list/secondside = getline(from, second) - from + var/obj/structure/beacon_wall/original = new /obj/structure/beacon_wall(from.loc) + original.forceMove(from) + walls += original + for(var/i = 1 to (firstside.len > secondside.len ? firstside.len : secondside.len)) + var/turf/firstfound = i <= firstside.len ? firstside[i] : null + var/turf/secondfound = i <= secondside.len ? secondside[i] : null + if(firstfound) + var/obj/structure/beacon_wall/B = new /obj/structure/beacon_wall(firstfound.loc) + B.forceMove(firstfound) + walls += B + playsound(B.loc, 'sound/mecha/mechstep.ogg', 300, 1, 10, pressure_affected = FALSE) + if(secondfound) + var/obj/structure/beacon_wall/B = new /obj/structure/beacon_wall(secondfound.loc) + B.forceMove(secondfound) + walls += B + playsound(B.loc, 'sound/mecha/mechstep.ogg', 300, 1, 10, pressure_affected = FALSE) + sleep(2) + +/obj/structure/beacon_generator/singularity_act() + return + +/obj/structure/beacon_generator/singularity_pull() + return + +/obj/structure/beacon_wall + name = "beacon wall" + icon = 'icons/mob/infection/infection.dmi' + icon_state = "beaconbarrier" + light_range = 4 + desc = "A wall of intense bluespace energy, any infestation that attempts to cross it is torn apart in a matter of seconds." + density = FALSE + move_resist = INFINITY + anchored = TRUE + layer = FLY_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + CanAtmosPass = ATMOS_PASS_NO + resistance_flags = INDESTRUCTIBLE + +/obj/structure/beacon_wall/blob_act() + return + +/obj/structure/beacon_wall/singularity_act() + return + +/obj/structure/beacon_wall/singularity_pull() + return + +/obj/structure/beacon_wall/CanPass(atom/movable/mover, turf/target) + if(mover.GetComponent(/datum/component/no_beacon_crossing)) + return FALSE + return ..() diff --git a/code/modules/antagonists/infection/designs.dm b/code/modules/antagonists/infection/designs.dm new file mode 100644 index 000000000000..e1e84ced4955 --- /dev/null +++ b/code/modules/antagonists/infection/designs.dm @@ -0,0 +1,39 @@ +/datum/design/chargepylon + name = "Charging Pylon" + desc = "A pylon that can recharge nearby powercells" + id = "infection_charger" + build_type = PROTOLATHE + materials = list(/datum/material/bluespace = 4000, /datum/material/glass = 500, /datum/material/diamond = 1500, /datum/material/iron = 200) + build_path = /obj/item/pylon_spawner/charger + category = list("equipment") + departmental_flags = DEPARTMENTAL_FLAG_ALL + +/datum/design/turretpylon + name = "Turret Pylon" + desc = "A pylon that destroys nearby infection" + id = "infection_turret" + build_type = PROTOLATHE + materials = list(/datum/material/bluespace = 4000, /datum/material/glass = 500, /datum/material/diamond = 1500, /datum/material/iron = 200) + build_path = /obj/item/pylon_spawner/turret + category = list("equipment") + departmental_flags = DEPARTMENTAL_FLAG_ALL + +/datum/design/sleeperup + name = "Infection Sleeper Upgrade" + desc = "An upgrade to increase the efficiency of sleepers" + id = "infection_sleeper_upgrade" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1200, /datum/material/glass = 1200, /datum/material/plastic = 5000, /datum/material/bluespace = 500, /datum/material/diamond = 250) //oh yes I A M going to do this + build_path = /obj/item/sleeper_enhancer + category = list("Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_ALL + +/datum/design/healinjector + name = "Infection Reusable Medical Injector" + desc = "A reusable medical injector using infection-based technology" + id = "infection_injector" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1200, /datum/material/glass = 1200, /datum/material/plastic = 500, /datum/material/bluespace = 1500, /datum/material/diamond = 500) + build_path = /obj/item/healing_injector + category = list("Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_ALL diff --git a/code/modules/antagonists/infection/equipment.dm b/code/modules/antagonists/infection/equipment.dm new file mode 100644 index 000000000000..c4cd1894eb02 --- /dev/null +++ b/code/modules/antagonists/infection/equipment.dm @@ -0,0 +1,115 @@ +/obj/item/sleeper_enhancer + name = "Sleeper Upgrade Unit" + desc = "A small attachment for a sleeper unit that massively increases its healing speed using infection-based technology" + icon = 'icons/mob/infection/infection.dmi' + icon_state = "sleeperup" + +/obj/item/sleeper_enhancer/pre_attack(atom/target, mob/living/user) + if(istype(target, /obj/machinery/sleeper)) + var/obj/machinery/sleeper/S = target + if(S.heal_rate != initial(S.heal_rate)) + to_chat(user, span_notice("The slot for [src] is already occupied!")) + return FALSE + S.heal_rate *= 3 + S.color = "#382a57" + to_chat(user, span_notice("You install [src] into [S], and a purple gel overtakes the interior of its cover. Hopefully this doesn't backfire...")) + qdel(src) + return FALSE + return ..() + +/obj/item/healing_injector + name = "portable medical injector" + desc = "A handheld autoinjector containing a strange blue fluid." + icon = 'icons/mob/infection/infection.dmi' + icon_state = "injector" + var/static/list/user_cooldown = list() + var/personal_cooldown_time = 1 MINUTES + var/cooldown_time = 3 MINUTES + var/on_cooldown = FALSE + +/obj/item/healing_injector/Initialize() + . = ..() + update_overlays() + +/obj/item/healing_injector/attack(mob/living/M, mob/user) + if(!cd_check(user)) + update_overlays(user) + return + user.visible_message(span_warning("[user] injects [M] with [src]!"), span_notice("You inject [M] with [src], and it seems to draw something from the air around you!")) + M.reagents.add_reagent(/datum/reagent/medicine/syndicate_nanites, 5) + user_cooldown[user] = TRUE + on_cooldown = TRUE + name = "used [name]" + desc = "An expended autoinjector, the fluid inside is rapidly regenerating..." + addtimer(CALLBACK(src, .proc/cooldown), cooldown_time) + addtimer(CALLBACK(src, .proc/personal_cooldown, user), personal_cooldown_time) + update_overlays(user) + +/obj/item/healing_injector/proc/cooldown() + on_cooldown = FALSE + name = initial(name) + desc = initial(desc) + update_overlays() + +/obj/item/healing_injector/proc/personal_cooldown(mob/user) + user_cooldown -= user + update_overlays() + +/obj/item/healing_injector/equipped(mob/user, slot) + . = ..() + update_overlays(user) + +/obj/item/healing_injector/dropped(mob/user) + . = ..() + update_overlays() //makes it refresh based on global cooldown vs personal cooldown if it's dropped + +/obj/item/healing_injector/proc/update_overlays(mob/user) + cut_overlays() + if(cd_check(user, TRUE)) + add_overlay("i_active") + +/obj/item/healing_injector/proc/cd_check(mob/user, silent) + . = TRUE + if(user && listgetindex(user_cooldown, user)) + if(!silent) + to_chat(user, span_warning("A warning light flashes on [src], it seems whatever it drew from you to recharge hasn't replenished.")) + return FALSE + if(on_cooldown) + if(!silent && user) + to_chat(user, span_warning("[src] hasn't finished recharging yet!")) + return FALSE + +/obj/item/targettingcomputer + name = "\improper NT laser rifle 'SmartFire' target acquisition and fire assist" + desc = "An advanced tactical computer attachable to a laser rifle, the computer will automatically account for any friendlies between the user and target." + icon = 'icons/mob/infection/infection.dmi' + icon_state = "tcomp" + +/obj/item/targettingcomputer/pre_attack(atom/target, mob/living/user) + if(istype(target, /obj/item/gun/energy) && !(target.type == /obj/item/gun/energy/laser)) //exact type match to prevent projectile shenanigans + to_chat(user, span_warning("[target] is not compatible with [src]!")) + return + var/obj/item/gun/energy/laser/ourgun = target + if(!istype(ourgun)) + return + var/obj/item/ammo_casing/energy/lasergun/L = ourgun.ammo_type[1] + if(L.projectile_type != initial(L.projectile_type)) + to_chat(user, span_warning("[target] has already been modified too heavily for [src] to be compatible!")) + return + to_chat(user, span_notice("You install [src] into [target].")) + ourgun.name = "modified [L.name]" + L.projectile_type = /obj/item/projectile/beam/laser/passfriendlies + QDEL_NULL(L.BB) //goodbye, old bullet + L.newshot() //hello, new bullet + qdel(src) + +/obj/item/crystal_shards + name = "infected crystal shard" + desc = "A large shard left over from an infected crystal, you should take these to a destructive analyzer." + icon = 'icons/mob/infection/infection.dmi' + icon_state = "crystal" + layer = ABOVE_MOB_LAYER + +/obj/item/crystal_shards/Initialize() + . = ..() + icon_state += "-[rand(0,15)]" diff --git a/code/modules/antagonists/infection/infection/actions.dm b/code/modules/antagonists/infection/infection/actions.dm new file mode 100644 index 000000000000..55febdd8861f --- /dev/null +++ b/code/modules/antagonists/infection/infection/actions.dm @@ -0,0 +1,221 @@ +/* + Actions that the infection and their creatures can use +*/ + +/datum/action/cooldown/infection + name = "Infection Power" + desc = "New Infection Power" + icon_icon = 'icons/mob/infection/action_icons.dmi' + button_icon_state = "" + cooldown_time = 0 + var/cost = 0 // cost to actually use + +/datum/action/cooldown/infection/New() + name = name + " ([cost])" + . = ..() + +/datum/action/cooldown/infection/Trigger() + if(!..()) + return FALSE + var/mob/I = owner + var/turf/T = get_turf(I) + if(T) + fire(I, T) + return TRUE + return FALSE + +/* + Called when all basic requirements for the action to be used have been met +*/ +/datum/action/cooldown/infection/proc/fire(mob/camera/commander/I, turf/T) + return TRUE + +/datum/action/cooldown/infection/coregrab + name = "Core Grab" + desc = "Causes a rift over an infection that a few seconds after creation, ruptures, sending everything on the turf to the core of the infection." + icon_icon = 'icons/effects/effects.dmi' + button_icon_state = "bluestream_fade" + cost = 50 + cooldown_time = 450 + +/datum/action/cooldown/infection/coregrab/fire(mob/camera/commander/I, turf/T) + var/obj/structure/infection/S = locate(/obj/structure/infection) in T.contents + if(S) + if(!I.can_buy(cost)) + return + StartCooldown() + playsound(T, 'sound/effects/seedling_chargeup.ogg', 100, FALSE, pressure_affected = FALSE) + new /obj/effect/temp_visual/bluespace_fissure(T) + sleep(9) + new /obj/effect/temp_visual/bluespace_fissure(T) + sleep(9) + new /obj/effect/temp_visual/bluespace_fissure(T) + sleep(9) + if(I.infection_core) + var/list/possible_turfs = RANGE_TURFS(2, I.infection_core) - RANGE_TURFS(1, I.infection_core) + var/do_fade = FALSE + for(var/mob/living/L in T.contents) + L.forceMove(pick(possible_turfs)) + do_fade = TRUE + if(do_fade) + new /obj/effect/temp_visual/fading_person(T) + return + to_chat(I, "You must be above an infection to use this ability!") + +/datum/action/cooldown/infection/targetlocation + name = "Target Location" + desc = "Announces to all current sentient slimes that you want them to target the location you are currently at." + icon_icon = 'icons/effects/landmarks_static.dmi' + button_icon_state = "x3" + cost = 0 + cooldown_time = 200 + +/datum/action/cooldown/infection/targetlocation/fire(mob/camera/commander/I, turf/T) + StartCooldown() + if(!I.infection_core) + to_chat(I, "The core has not landed yet!") + return + to_chat(I, "You alert your slimes to target this spot!") + for(var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/SM in I.infection_mobs) + SM.playsound_local(SM.loc, 'sound/effects/magic.ogg', 100, 1) + // give a link to the mob to walk towards the location + to_chat(SM, "The commander is requesting that you prioritize a location!") + +/datum/action/cooldown/infection/creator + name = "Create" + desc = "New Creation Power" + // type of infection structure to create + var/type_to_create + // must be placed more than this distance away from another structure of the same type + var/distance_from_similar = 0 + // whether or not this structure requires a node to be placed down + var/needs_node = FALSE + +/datum/action/cooldown/infection/creator/fire(mob/camera/commander/I, turf/T) + I.createSpecial(cost, type_to_create, distance_from_similar, needs_node, T) + return TRUE + +/datum/action/cooldown/infection/creator/shield + name = "Create Shield Infection" + desc = "Create a shield infection, which is harder to kill and has resistances to different types of attacks." + cost = 5 + button_icon_state = "wall" + type_to_create = /obj/structure/infection/shield + +/datum/action/cooldown/infection/creator/reflective + name = "Create Reflective Shield Infection" + desc = "Create a shield that will reflect projectiles back at your enemies." + cost = 10 + button_icon_state = "reflective" + type_to_create = /obj/structure/infection/shield/reflective + +/datum/action/cooldown/infection/creator/node + name = "Create Node Infection" + desc = "Create a node, which will power nearby factory and resource structures." + cost = 50 + button_icon_state = "node" + type_to_create = /obj/structure/infection/node + distance_from_similar = 6 + +/datum/action/cooldown/infection/creator/resource + name = "Create Resource Infection" + desc = "Create a resource tower which will gradually generate resources for you." + cost = 25 + button_icon_state = "resource" + type_to_create = /obj/structure/infection/resource + distance_from_similar = 4 + needs_node = TRUE + +/datum/action/cooldown/infection/creator/factory + name = "Create Factory Infection" + desc = "Create a spore tower that will spawn spores to harass your enemies." + cost = 50 + button_icon_state = "factory" + type_to_create = /obj/structure/infection/factory + distance_from_similar = 7 + needs_node = TRUE + +/datum/action/cooldown/infection/creator/turret + name = "Create Turret Infection" + desc = "Create a turret that will automatically fire at your enemies." + cost = 50 + button_icon_state = "turret" + type_to_create = /obj/structure/infection/turret + distance_from_similar = 8 + needs_node = TRUE + +/datum/action/cooldown/infection/creator/beamturret + name = "Create Beam Turret Infection" + desc = "Create a turret that will automatically fire and instantly stick to your enemies." + cost = 50 + button_icon_state = "beamturret" + type_to_create = /obj/structure/infection/turret/beam + distance_from_similar = 8 + needs_node = TRUE + +/datum/action/cooldown/infection/creator/vacuum + name = "Create Vacuum Infection" + desc = "Create a vacuum that will suck in anything non-infectious, as well as hurt things caught in it." + cost = 50 + button_icon_state = "vacuum" + type_to_create = /obj/structure/infection/vacuum + distance_from_similar = 8 + needs_node = TRUE + +/datum/action/cooldown/infection/creator/barrier + name = "Create Barrier Infection" + desc = "Create a barrier that will function as a normal wall, but will allow infectious creatures to pull things through them." + cost = 15 + button_icon_state = "door" + type_to_create = /obj/structure/infection/shield/barrier + distance_from_similar = 3 + +/datum/action/cooldown/infection/mininode + name = "Miniature Node" + desc = "Creates a miniature node on the infection you're standing on." + button_icon_state = "node" + cooldown_time = 600 + +/datum/action/cooldown/infection/mininode/fire(mob/living/simple_animal/hostile/infection/infectionspore/sentient/S, turf/T) + var/obj/structure/infection/I = locate(/obj/structure/infection/normal) in T.contents + if(I) + StartCooldown() + playsound(T, 'sound/effects/splat.ogg', 100, FALSE, pressure_affected = FALSE) + I.change_to(/obj/structure/infection/node/mini, I.overmind, 25) + return + to_chat(S, "You must be above an infection to use this ability!") + +/datum/action/cooldown/infection/reflective + name = "Reflective Shield" + desc = "Creates a reflective shield on the infection you're standing on." + button_icon_state = "reflective" + cooldown_time = 450 + +/datum/action/cooldown/infection/reflective/fire(mob/living/simple_animal/hostile/infection/infectionspore/sentient/S, turf/T) + var/obj/structure/infection/I = locate(/obj/structure/infection/normal) in T.contents + if(I) + StartCooldown() + playsound(T, 'sound/effects/splat.ogg', 100, FALSE, pressure_affected = FALSE) + I.change_to(/obj/structure/infection/shield/reflective, I.overmind, 25) + return + to_chat(S, "You must be above an infection to use this ability!") + +/datum/action/cooldown/infection/flash + name = "Bright Flash" + desc = "Creates a bright flash of light centered around you." + icon_icon = 'icons/obj/assemblies/new_assemblies.dmi' + button_icon_state = "flash" + cooldown_time = 450 + +/datum/action/cooldown/infection/flash/fire(mob/living/simple_animal/hostile/infection/infectionspore/sentient/S, turf/T) + if(ISRESPAWNING(S)) + to_chat(S, "You must be alive to use this ability!") + return + StartCooldown() + playsound(T, 'sound/weapons/flash.ogg', 100, FALSE, pressure_affected = FALSE) + new /obj/effect/temp_visual/at_shield(T) + sleep(8) + new /obj/effect/temp_visual/at_shield(T) + sleep(8) + for(var/mob/living/L in viewers(S,2) - S) + L.flash_act() diff --git a/code/modules/antagonists/infection/infection/commander.dm b/code/modules/antagonists/infection/infection/commander.dm new file mode 100644 index 000000000000..ca9518d6346e --- /dev/null +++ b/code/modules/antagonists/infection/infection/commander.dm @@ -0,0 +1,327 @@ +//Few global vars to track the infections +GLOBAL_LIST_EMPTY(infections) //complete list of all infections made. +GLOBAL_LIST_EMPTY(infection_nodes) +GLOBAL_VAR(infection_core) +GLOBAL_VAR(infection_commander) + +/* + The actual commander of the infection that places down all of the structures and commands every creature +*/ + +/mob/camera/commander + name = "Infection Commander" + real_name = "Infection Commander" + desc = "The commander. It controls the infection." + icon = 'icons/mob/cameramob.dmi' + icon_state = "marker" + mouse_opacity = MOUSE_OPACITY_ICON + move_on_shuttle = TRUE + see_in_dark = 8 + invisibility = INVISIBILITY_OBSERVER + layer = FLY_LAYER + color = "#00a7ff" + + pass_flags = PASSBLOB + faction = list(ROLE_INFECTION) + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + hud_type = /datum/hud/infection_commander + // The infection commanders physical core + var/obj/structure/infection/core/infection_core = null + // The amount of points that can be spent on structures and powers + var/infection_points = 0 + // The maximum amount of points that can be attained + var/max_infection_points = 100 + // Upgrade points used to buy evolutions in the evolution shop + var/upgrade_points = 1 + // List of all the infection mobs this commander controls + var/list/infection_mobs = list() + // List of all the resource infection this commander controls + var/list/resource_infection = list() + // If the infection requires nodes to place down some structures + var/nodes_required = FALSE + // If the core has been placed or not + var/placed = FALSE + // Are we placing the core of the infection? Used to prevent premature end of gamemode + var/placing = FALSE + // If this commander can move his camera wherever he wants with no limitations + var/freecam = TRUE + // Points generated every life tick from the core + var/base_point_rate = 2 + // The amount of time it takes for the core to be placed after this mob has been spawned + var/autoplace_time = CORE_AUTOPLACE_TIME + // If we're winning and don't want to lose after this moment + var/victory_in_progress = FALSE + // Color that all of the infection are tinted + var/infection_color = "#ffffff" + // The medical hud display for the commander + var/datum/atom_hud/medical_hud + + // Actions that the infection commander starts with + var/list/default_actions = list(/datum/action/cooldown/infection/creator/shield, + /datum/action/cooldown/infection/creator/resource, + /datum/action/cooldown/infection/creator/node, + /datum/action/cooldown/infection/creator/factory, + /datum/action/cooldown/infection/coregrab, + /datum/action/cooldown/infection/targetlocation) + + // Actions that the infection commander can spend upgrade points to unlock + var/list/unlockable_actions = list() + + // Menu handler for the evolution menu + var/datum/infection_menu/menu_handler + +/mob/camera/commander/Initialize(mapload, starting_points = max_infection_points) + if(GLOB.infection_commander) + return INITIALIZE_HINT_QDEL // there can be only one + . = ..() + GLOB.infection_commander = src + infection_points = starting_points + autoplace_time += world.time + if(infection_core) + infection_core.update_icon() + SSshuttle.registerHostileEnvironment(src) + addtimer(CALLBACK(src, .proc/generate_announcement), CORE_AUTOPLACE_TIME * 0.1) + addtimer(CALLBACK(src, .proc/place_beacons), CORE_AUTOPLACE_TIME * 0.3) + addtimer(CALLBACK(src, .proc/info_announcement), CORE_AUTOPLACE_TIME * 0.5) + + for(var/type_action in default_actions) + var/datum/action/cooldown/infection/add_action = new type_action() + add_action.Grant(src) + generate_unlockables() + SSmobs.clients_by_zlevel[z] += src + menu_handler = new /datum/infection_menu(src) + START_PROCESSING(SSobj, src) + +/* + Adds unlockables to the unlockable upgrades list so you don't have to manually +*/ +/mob/camera/commander/proc/generate_unlockables() + for(var/upgrade_type in subtypesof(/datum/infection_upgrade/overmind)) + unlockable_actions += new upgrade_type() + +/* + First info announcement when the infection has just been spotted +*/ +/mob/camera/commander/proc/generate_announcement() + priority_announce("[station_name()]: A self replicating hostile entity has been detected on a collision course with your station. \n\ + Our calculations estimate the substance will impact in [(autoplace_time - world.time)/600] minutes.\n\n\ + The substance reacts negatively to strong bluespace fields, and as such we are deploying several generators across your station to stave it off. \n\ + Be advised the infection can overwhelm these generators if it maintains direct contact with them. The generators are irreplacable so do not let them be destroyed. \n\ + There will also be a gravity generator near your arrivals shuttle, we recommend that you power it unless you want to fight while floating around.", + "CentCom Exotic Materials Research Division", 'sound/misc/notice1.ogg') + +/* + Extra info announcement to hopefully avoid people running in and dying to an unkillable enemy +*/ +/mob/camera/commander/proc/info_announcement() + priority_announce("[station_name()]: The entity's core has proven immune to nuclear, laser, and ballistic weaponry. You will have to hold it off until a means of destroying it is discovered. \n\n\ + The core also appears to be protected by several short range anti-personnel structures. Unplanned attacks are likely to result in death. \n\n\ + On that note, the infection appears to be able to assimilate deceased complex life, turning them into rapidly adapting slimes through an unknown means. \n\n\ + Assimilation into a class 5 entity is in violation of your contracts and is not covered under NT insurance policy.", + "CentCom Exotic Materials Research Division", 'sound/misc/notice1.ogg') + +/* + Players win, infection is defeated +*/ +/mob/camera/commander/proc/defeated_announcement() + priority_announce("The core's energy signature has terminated. Fragments will be brought in for research. Excellent field work.", + "CentCom Exotic Materials Research Division", 'sound/misc/notice2.ogg') + +/* + Places the beacons down at all of the landmarks in the map files, slightly delayed to make it look cool +*/ +/mob/camera/commander/proc/place_beacons() + for(var/obj/effect/landmark/beacon_start/B in GLOB.beacon_spawns) + var/turf/T = get_turf(B) + var/obj/structure/beacon_generator/G = new /obj/structure/beacon_generator(T.loc) + G.forceMove(T) + G.setDir(B.dir) + INVOKE_ASYNC(G, /obj/structure/beacon_generator.proc/generateWalls) + sleep(100 / GLOB.beacon_spawns.len) + var/turf/T = pick(GLOB.infection_gravity_spawns) + if(T) + new /obj/machinery/gravity_generator/main/station(T) + else + message_admins("Could not find extra gravity generator spawn location for infection gamemode, consider spawning in a gravity generator behind all of the beacons.") + +/mob/camera/commander/process() + if(!infection_core) + if(!placed && !placing) + if(autoplace_time && world.time >= autoplace_time) + place_infection_core() + else if(placed) + qdel(src) + else if(!victory_in_progress && !GLOB.infection_beacons.len) + victory_in_progress = TRUE + priority_announce("Your last bluespace generator has been destroyed, without the presence of a bluespace causality anchor the infection has free reign of your station. Estimated time until takeover: 25 seconds.", "CentCom Exotic Materials Research Division") + set_security_level("delta") + max_infection_points = INFINITY + infection_points = INFINITY + addtimer(CALLBACK(src, .proc/victory), 250) + +/* + Called when all of the beacons have been destroyed and the infection has won +*/ +/mob/camera/commander/proc/victory() + sound_to_playing_players('sound/machines/alarm.ogg') + sleep(100) + for(var/i in GLOB.mob_living_list - src) + var/mob/living/L = i + var/turf/T = get_turf(L) + if(!T || !is_station_level(T.z)) + continue + + if(L in GLOB.overminds || (L.pass_flags & PASSBLOB)) + continue + + var/area/Ablob = get_area(T) + + if(!Ablob.blob_allowed) + continue + + if(!(ROLE_INFECTION in L.faction)) + playsound(L, 'sound/effects/splat.ogg', 50, 1) + L.death() + new/mob/living/simple_animal/hostile/infection/infectionspore(T) + else + L.fully_heal() + + for(var/area/A in GLOB.sortedAreas) + if(!(A.type in GLOB.the_station_areas)) + continue + if(!A.blob_allowed) + continue + A.name = "infection" + A.icon = 'icons/mob/infection/infection.dmi' + A.icon_state = "normal" + A.layer = BELOW_MOB_LAYER + A.invisibility = 0 + A.blend_mode = 0 + var/datum/antagonist/infection/I = mind.has_antag_datum(/datum/antagonist/infection) + if(I) + var/datum/objective/infection_takeover/main_objective = locate() in I.objectives + if(main_objective) + main_objective.completed = TRUE + to_chat(world, "[real_name] consumed the station in an unstoppable tide!") + SSticker.news_report = BLOB_WIN + SSticker.force_ending = TRUE + +/mob/camera/commander/Destroy() + GLOB.infection_commander = null + for(var/IN in GLOB.infections) + var/obj/structure/infection/I = IN + if(I && I.overmind == src) + I.overmind = null + I.update_icon() //reset anything that was ours + for(var/IB in infection_mobs) + var/mob/living/simple_animal/hostile/infection/I = IB + if(I) + I.overmind = null + I.update_icons() + STOP_PROCESSING(SSobj, src) + + SSshuttle.clearHostileEnvironment(src) + + SSmobs.clients_by_zlevel[z] -= src + + addtimer(CALLBACK(src, .proc/defeated_announcement), 40) + + return ..() + +/mob/camera/commander/Login() + . = ..() + to_chat(src, "You are the infection!") + infection_help() + update_health_hud() + add_points(0) + +/mob/camera/commander/examine(mob/user) + . = ..() + to_chat(user, "The commander of the infection.") + +/mob/camera/commander/update_health_hud() + if(infection_core) + hud_used.healths.maptext = "
[round(infection_core.obj_integrity)]
"
+
+/*
+ Adds points to the infection commander, but not over or under the maximum or minimum
+*/
+/mob/camera/commander/proc/add_points(points)
+ infection_points = clamp(infection_points + points, 0, max_infection_points)
+ hud_used.infectionpwrdisplay.maptext = "[round(infection_points)]
"
+
+/mob/camera/commander/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+ if (!message)
+ return
+
+ if (client)
+ if(client.prefs.muted & MUTE_IC)
+ to_chat(src, "You cannot send IC messages (muted).")
+ return
+ if (src.client.handle_spam_prevention(message,MUTE_IC))
+ return
+
+ if (stat)
+ return
+
+ infection_talk(message)
+
+/*
+ Tries to talk to other fellow infectious creature with the message sent
+*/
+/mob/camera/commander/proc/infection_talk(message)
+
+ message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+ if (!message)
+ return
+
+ log_talk(message, LOG_SAY)
+
+ var/rendered = "([src.name]) [message]"
+
+ for(var/mob/M in GLOB.mob_list)
+ if(iscommander(M) || isinfectionmonster(M))
+ to_chat(M, rendered)
+ if(isobserver(M))
+ var/link = FOLLOW_LINK(M, src)
+ to_chat(M, "[link] [rendered]")
+
+/mob/camera/commander/blob_act(obj/structure/infection/I)
+ return
+
+/*
+ Toggles the medical heads up display
+*/
+/mob/camera/commander/proc/toggle_medical_hud()
+ if(medical_hud)
+ medical_hud.remove_hud_from(src)
+ medical_hud = null
+ else
+ var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+ hud.add_hud_to(src)
+ medical_hud = hud
+
+/mob/camera/commander/Stat()
+ . = ..()
+ if(statpanel("Status"))
+ if(infection_core)
+ stat(null, "Core Health: [infection_core.obj_integrity]")
+ stat(null, "Power Stored: [infection_points]/[max_infection_points]")
+ stat(null, "Upgrade Points: [upgrade_points]")
+ stat(null, "Beacons Remaining: [GLOB.infection_beacons.len]")
+ if(!placed)
+ stat(null, "Time Before Landing: [max(round((autoplace_time - world.time)*0.1, 0.1), 0)]")
+
+/mob/camera/commander/Move(NewLoc, Dir = 0)
+ if(freecam || !placed)
+ forceMove(NewLoc)
+ return TRUE
+ if(placed)
+ var/obj/structure/infection/I = locate() in range("3x3", NewLoc)
+ if(I)
+ forceMove(NewLoc)
+ return TRUE
+ else
+ return FALSE
+ return TRUE
diff --git a/code/modules/antagonists/infection/infection/mobs/infection_mobs.dm b/code/modules/antagonists/infection/infection/mobs/infection_mobs.dm
new file mode 100644
index 000000000000..947859092670
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/mobs/infection_mobs.dm
@@ -0,0 +1,164 @@
+
+/*
+ Base slime type not meant to be spawned
+*/
+
+/mob/living/simple_animal/hostile/infection
+ icon = 'icons/mob/infection/slime_mob.dmi'
+ pass_flags = PASSBLOB
+ faction = list(ROLE_INFECTION)
+ bubble_icon = "blob"
+ speak_emote = null //so we use verb_yell/verb_say/etc
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 360
+ unique_name = 1
+ light_range = 6
+ a_intent = INTENT_HARM
+ stat_attack = DEAD
+ // if the spore can cross beacons
+ var/can_cross_beacons = FALSE
+ // the overmind of the spore
+ var/mob/camera/commander/overmind = null
+ // the factory the spore spawned from
+ var/obj/structure/infection/factory/factory = null
+
+/mob/living/simple_animal/hostile/infection/Initialize(mapload, owner_overmind)
+ . = ..()
+ verbs -= /mob/living/verb/pulled
+ if(!can_cross_beacons)
+ AddComponent(/datum/component/no_beacon_crossing)
+
+/mob/living/simple_animal/hostile/infection/update_icons()
+ if(overmind)
+ add_atom_colour(overmind.infection_color, FIXED_COLOUR_PRIORITY)
+ else
+ remove_atom_colour(FIXED_COLOUR_PRIORITY)
+
+/mob/living/simple_animal/hostile/infection/Destroy()
+ if(overmind)
+ overmind.infection_mobs -= src
+ return ..()
+
+/mob/living/simple_animal/hostile/infection/blob_act(obj/structure/infection/I)
+ if(stat != DEAD && health < maxHealth)
+ for(var/i in 1 to 2)
+ var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
+ if(overmind)
+ H.color = overmind.color
+ else
+ H.color = "#000000"
+ adjustHealth(-maxHealth*0.0125)
+
+/mob/living/simple_animal/hostile/infection/fire_act(exposed_temperature, exposed_volume)
+ ..()
+ if(istype(src, /mob/living/simple_animal/hostile/infection/infectionspore/sentient))
+ return
+ if(exposed_temperature)
+ adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
+ else
+ adjustFireLoss(5)
+
+/mob/living/simple_animal/hostile/infection/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover, /obj/structure/infection) || istype(mover, /obj/item/projectile/bullet/infection))
+ return 1
+ return ..()
+
+/mob/living/simple_animal/hostile/infection/Process_Spacemove(movement_dir = 0)
+ for(var/obj/structure/infection/I in range(1, src))
+ return 1
+ return ..()
+
+/mob/living/simple_animal/hostile/infection/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+ if (!message)
+ return
+
+ if (src.client)
+ if(client.prefs.muted & MUTE_IC)
+ to_chat(src, "You cannot send IC messages (muted).")
+ return
+ if (src.client.handle_spam_prevention(message,MUTE_IC))
+ return
+
+ infection_chat(message)
+
+/*
+ Attempts to talk using the message
+*/
+/mob/living/simple_animal/hostile/infection/proc/infection_chat(msg)
+ var/rendered = "\[Infection Telepathy\] [real_name] [msg]"
+ for(var/M in GLOB.mob_list)
+ if(iscommander(M) || isinfectionmonster(M))
+ to_chat(M, rendered)
+ if(isobserver(M))
+ var/link = FOLLOW_LINK(M, src)
+ to_chat(M, "[link] [rendered]")
+
+/*
+ A normal infection slime created from factories
+*/
+
+/mob/living/simple_animal/hostile/infection/infectionspore
+ name = "infection slime"
+ desc = "A fragile floating crystal, generating a floating ball of slime."
+ icon_state = "infest-slime-core"
+ icon_living = "infest-slime-core"
+ health = 70
+ maxHealth = 70
+ verb_say = "psychically pulses"
+ verb_ask = "psychically probes"
+ verb_exclaim = "psychically yells"
+ verb_yell = "psychically screams"
+ melee_damage_lower = 10
+ melee_damage_upper = 10
+ obj_damage = 20
+ environment_smash = ENVIRONMENT_SMASH_STRUCTURES
+ attacktext = "hits"
+ attack_sound = 'sound/weapons/genhit1.ogg'
+ movement_type = FLYING
+ del_on_death = 1
+ deathmessage = "dissapates in the atmosphere!"
+ // color of the crystal on top of the infection slime
+ var/crystal_color = "#ffffff"
+ var/crystal_icon_state = "infest-slime-layer"
+
+/mob/living/simple_animal/hostile/infection/infectionspore/Initialize(mapload, var/obj/structure/infection/factory/linked_node, commander)
+ if(istype(linked_node))
+ factory = linked_node
+ factory.spores += src
+ if(commander)
+ overmind = commander
+ update_icons()
+ . = ..()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/Life()
+ update_icons()
+ if(factory && z != factory.z)
+ death()
+ ..()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/death(gibbed)
+ if(factory)
+ factory.spore_delay = world.time + factory.spore_cooldown //put the factory on cooldown
+ ..()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/Destroy()
+ if(factory)
+ factory.spores -= src
+ factory = null
+ return ..()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/update_icons()
+ cut_overlays()
+ color = null
+ var/mutable_appearance/slime_crystal = mutable_appearance('icons/mob/infection/slime_mob.dmi', crystal_icon_state)
+ if(crystal_color)
+ slime_crystal.color = crystal_color
+ add_overlay(slime_crystal)
+
+/mob/living/simple_animal/hostile/infection/infectionspore/weak
+ name = "fragile infection slime"
+ health = 15
+ maxHealth = 15
+ melee_damage_lower = 1
+ melee_damage_upper = 2
diff --git a/code/modules/antagonists/infection/infection/mobs/sentient_mobs.dm b/code/modules/antagonists/infection/infection/mobs/sentient_mobs.dm
new file mode 100644
index 000000000000..e26082114a98
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/mobs/sentient_mobs.dm
@@ -0,0 +1,312 @@
+/*
+ The actual player controlled slime type
+*/
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient
+ name = "evolving slime"
+ desc = "An extremely strong slime in the early stages of life, what will it become next?"
+ hud_type = /datum/hud/infection_spore
+ damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
+ crystal_color = "#ff8c00"
+ obj_damage = 40
+ // respawn time for the slime
+ var/respawn_time = 1 MINUTES
+ // the time left to respawn
+ var/current_respawn_time = 0
+ // the upgrade points the spore has stored
+ var/upgrade_points = 0
+ // the spent upgrade points, half of these are given back when they refund the upgrades
+ var/spent_upgrade_points = 0
+ // the maximum number of upgrade points that the slime is allowed to have
+ var/max_upgrade_points = 1000
+ // the upgrade types given to the slime
+ var/list/upgrade_types = list()
+ // the actual upgrades
+ var/list/upgrades = list()
+ // the upgrade subtype added to upgrade types
+ var/upgrade_subtype = /datum/infection_upgrade/spore_type_change
+ // handles the menu for upgrading
+ var/datum/infection_menu/menu_handler
+ // Actions that the slime starts with
+ var/list/default_actions = list()
+ // the mob we get moved to while respawning
+ var/mob/camera/infectionslime/respawnmob
+ // things that can drop after the slime dies a fake death
+ var/list/slime_drops = list(/obj/item/gun/energy/laser=1,
+ /obj/item/slimecrossbeaker/autoinjector/regenpack=1,
+ /obj/item/pickaxe/drill/diamonddrill=2,
+ /obj/item/clothing/shoes/magboots=2)
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/Initialize(mapload, var/obj/structure/infection/factory/linked_node, commander)
+ . = ..()
+ generate_upgrades()
+ for(var/type_action in default_actions)
+ var/datum/action/cooldown/infection/add_action = new type_action()
+ add_action.Grant(src)
+
+/*
+ Generates the actual upgrade datums for this slime
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/generate_upgrades()
+ if(ispath(upgrade_subtype))
+ upgrade_types += subtypesof(upgrade_subtype)
+ for(var/upgrade_type in upgrade_types)
+ upgrades += new upgrade_type()
+ menu_handler = new /datum/infection_menu(src)
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/Stat()
+ ..()
+ if(statpanel("Status"))
+ stat(null, "Upgrade Points: [upgrade_points]")
+ if(overmind && !overmind.placed)
+ stat(null, "Time Before Collission: [max(round((overmind.autoplace_time - world.time)*0.1, 0.1), 0)]")
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/Login()
+ . = ..()
+ client.images |= image('icons/mob/cameramob.dmi', respawnmob, "marker")
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/gib()
+ death()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/Life()
+ . = ..()
+ if(!client)
+ death()
+ add_points(get_point_generation_rate())
+ if(!ISRESPAWNING(src))
+ var/list/infection_in_area = range(2, src)
+ var/healed = FALSE
+ if(locate(/obj/structure/infection/core) in infection_in_area)
+ adjustHealth(-maxHealth*0.1)
+ healed = TRUE
+ if(locate(/obj/structure/infection/node) in infection_in_area)
+ adjustHealth(-maxHealth*0.05)
+ healed = TRUE
+ if(healed)
+ var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
+ H.color = "#00ff00"
+ if(!(locate(/obj/structure/infection) in infection_in_area))
+ adjustHealth(maxHealth*0.025)
+ var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being hurt
+ H.color = "#ff0000"
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/AttackingTarget()
+ if(isliving(target))
+ var/mob/living/L = target
+ if(ROLE_INFECTION in L.faction)
+ return FALSE
+ . = ..()
+
+/*
+ Sets the point value for the slime
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/set_points(var/value)
+ add_points(value - upgrade_points)
+
+/*
+ Adds points to the infection slime
+ Does not go over or below the maximum and minimum values
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/add_points(var/value)
+ upgrade_points = clamp(upgrade_points + value, 0, max_upgrade_points)
+ if(hud_used)
+ hud_used.infectionpwrdisplay.maptext = "[round(upgrade_points)]
"
+
+/*
+ The amount of points given to the slime every life tick
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/get_point_generation_rate()
+ if(!GLOB.infection_core)
+ return 0
+ return 2
+
+/*
+ Attempts to open the evolution menu of this slime
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/evolve_menu()
+ if(!ISRESPAWNING(src))
+ to_chat(src, "You cannot evolve unless you are reforming at a node or core!")
+ return
+ menu_handler.ui_interact(src)
+
+/*
+ Attempts to upgrade something with this slimes points
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/can_upgrade(cost = 1)
+ var/diff = upgrade_points - cost
+ if(diff < 0)
+ to_chat(src, "You cannot afford this, you need at least [diff * -1] more points!")
+ return FALSE
+ upgrade_points = diff
+ spent_upgrade_points += cost
+ return TRUE
+
+/*
+ Help text for the infection slime
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/infection_help()
+ to_chat(src, "You are an evolving slime!")
+ to_chat(src, "You are an evolving creature that can select evolutions in order to become stronger \nYou will respawn as long as the core still exists.")
+ to_chat(src, "Attempt to help expand your army of infectious slimes by bringing sentient human corpses near the infection core!")
+ to_chat(src, "You can communicate with other infectious creatures via .b")
+ return
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(updating_health)
+ update_health_hud()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/update_health_hud()
+ if(hud_used)
+ hud_used.healths.maptext = "[round((health / maxHealth) * 100, 0.5)]%
"
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/dust(just_ash, drop_items, force)
+ return death()
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/death(gibbed)
+ if(ISRESPAWNING(src))
+ return // no you dont
+ if(overmind?.infection_core) // cant die as long as core is still alive
+ stop_pulling()
+ playsound(loc, 'sound/effects/splat.ogg', 100, FALSE, pressure_affected = FALSE)
+ visible_message("[src] fades into pure energy that races towards the core of the infection.",
+ "You return to the core of the infection to reform your body.")
+ var/type_of_drop = pickweight(slime_drops)
+ var/turf/T = get_turf(src)
+ if(type_of_drop && T)
+ new type_of_drop(T)
+ if(!respawnmob)
+ create_respawn_mob(get_turf(overmind.infection_core))
+ forceMove(respawnmob)
+ client?.images |= image('icons/mob/cameramob.dmi', respawnmob, "marker")
+ INVOKE_ASYNC(src, .proc/start_spawn)
+ return
+ . = ..()
+
+/*
+ Start the respawning cycle
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/start_spawn(increase_time = respawn_time)
+ if(increase_time <= 0)
+ current_respawn_time = world.time
+ return
+ current_respawn_time = world.time + increase_time
+ to_chat(src, "You will be able to respawn in [round((current_respawn_time - world.time) / 10, 1)] seconds.")
+ sleep(increase_time)
+ if(!QDELETED(src) && current_respawn_time <= world.time)
+ to_chat(src, "You may now respawn!")
+ playsound_local(src, 'sound/effects/splat.ogg', 100)
+
+/*
+ Actually respawn the slime when they request it
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/do_spawn()
+ if(!ISRESPAWNING(src))
+ to_chat(src, "You cannot respawn right now!")
+ return
+ if(current_respawn_time > world.time)
+ to_chat(src, "You will be able to respawn in [round((current_respawn_time - world.time) / 10, 1)] seconds.")
+ return
+ var/turf/T = get_turf(src)
+ if(T)
+ if((locate(/obj/structure/infection/node) in T) || (locate(/obj/structure/infection/core) in T))
+ adjustHealth(-maxHealth)
+ forceMove(T)
+ playsound_local(src, 'sound/effects/splat.ogg', 100)
+ return
+ to_chat(src, "You may only respawn at the core or at a node!")
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/create_respawn_mob(var/turf/T)
+ if(respawnmob)
+ QDEL_NULL(respawnmob)
+ respawnmob = new /mob/camera/infectionslime(T)
+ forceMove(respawnmob)
+ client?.images |= image('icons/mob/cameramob.dmi', respawnmob, "marker")
+
+/*
+ Try to transfer this slimes mind and data to a new slime type
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/transfer_to_type(var/new_type)
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/new_spore = new new_type(loc, null, overmind)
+ mind.transfer_to(new_spore)
+ new_spore.upgrade_points = upgrade_points
+ new_spore.spent_upgrade_points = spent_upgrade_points
+ new_spore.create_respawn_mob(respawnmob.loc)
+ qdel(respawnmob)
+ INVOKE_ASYNC(new_spore, .proc/start_spawn, current_respawn_time - world.time)
+ overmind.infection_mobs += new_spore
+ qdel(src)
+ new_spore.update_icons()
+ new_spore.evolve_menu() // re-update the menu since they changed type
+
+/*
+ Refund the upgrades this slime has purchased and transfer them to a base type
+*/
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/proc/refund_upgrades()
+ if(!ISRESPAWNING(src))
+ to_chat(src, "You cannot revert unless you are reforming!")
+ return
+ if(spent_upgrade_points == 0)
+ to_chat(src, "We are unable to revert our form any further!")
+ return
+ var/confirm = alert("Are you sure you want to refund all of your upgrades?", "Revert Form", "Yes", "No")
+ if(confirm != "Yes")
+ return
+ to_chat(src, "Successfully reverted to base evolution!")
+ if(!GLOB.infection_core)
+ add_points(spent_upgrade_points) // no cost when in loading
+ else
+ add_points(round(spent_upgrade_points / 2, 1))
+ spent_upgrade_points = 0
+ // reset the spore to default
+ transfer_to_type(/mob/living/simple_animal/hostile/infection/infectionspore/sentient)
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector
+ name = "infector slime"
+ desc = "A slime that oozes infective pus from all of it's pores."
+ icon_state = "infest-moth-core"
+ crystal_color = "#ffffff"
+ crystal_icon_state = "infest-moth-layer"
+ upgrade_subtype = /datum/infection_upgrade/infector
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/hunter
+ name = "hunter slime"
+ desc = "A congealed but fast moving slime with the abilities to hunt down and consume intruders of the infection."
+ crystal_color = "#dc143c"
+ upgrade_subtype = /datum/infection_upgrade/hunter
+
+/mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive
+ name = "destructive slime"
+ desc = "A slow moving but bulky and heavily damaging slime that is useful for taking out buildings and walls, as well as defending infection structures."
+ health = 100
+ maxHealth = 100
+ speed = 5
+ obj_damage = 80
+ crystal_color = "#4169e1"
+ transform = matrix(1.5, 0, 0, 0, 1.5, 0)
+ environment_smash = ENVIRONMENT_SMASH_WALLS
+ upgrade_subtype = /datum/infection_upgrade/destructive
+
+/mob/camera/infectionslime
+ name = "Respawning Infection Slime"
+ real_name = "Respawning Infection Slime"
+ desc = "An infectious slime choosing where it should spawn."
+ icon = 'icons/mob/cameramob.dmi'
+ icon_state = "marker"
+ mouse_opacity = MOUSE_OPACITY_ICON
+ move_on_shuttle = TRUE
+ see_in_dark = 8
+ invisibility = INVISIBILITY_OBSERVER
+ layer = FLY_LAYER
+ color = "#ffffff"
+ pass_flags = PASSBLOB
+ faction = list(ROLE_INFECTION)
+ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+
+/mob/camera/infectionslime/Move(NewLoc, Dir = 0)
+ forceMove(NewLoc)
+
+/mob/camera/infectionslime/relaymove(mob/user, direction)
+ var/NewLoc = get_step(src, direction)
+ if(NewLoc)
+ Move(NewLoc, direction)
diff --git a/code/modules/antagonists/infection/infection/normalinfection.dm b/code/modules/antagonists/infection/infection/normalinfection.dm
new file mode 100644
index 000000000000..c3589a877c1e
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/normalinfection.dm
@@ -0,0 +1,495 @@
+/*
+ Base infection structure type that is not meant to be spawned
+*/
+
+/obj/structure/infection
+ name = "infection"
+ icon = 'icons/mob/infection/infection.dmi'
+ light_range = 4
+ desc = "A thick carpet of writhing tendrils."
+ density = FALSE
+ spacemove_backup = TRUE
+ opacity = 0
+ anchored = TRUE
+ layer = TABLE_LAYER
+ CanAtmosPass = ATMOS_PASS_PROC
+ max_integrity = 30
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+ resistance_flags = ACID_PROOF
+ // How many points the commander gets back when it removes an infection of that type. If less than 0, structure cannot be removed.
+ var/point_return = 0
+ // how much health this blob regens when pulsed
+ var/health_regen = 5
+ // how much time needs to pass before the infection can be pulsed again
+ var/next_pulse = 0
+ // time added to next_pulse
+ var/pulse_cooldown = 20
+ // multiplies incoming brute damage by this
+ var/brute_resist = 0.75
+ // multiplies incoming burn damage by this
+ var/fire_resist = 0.5
+ // if the infection blocks atmos and heat spread
+ var/atmosblock = TRUE
+ // the controlling overmind of this structure
+ var/mob/camera/commander/overmind
+ // the angles that the node will expand on first, used to give a uniform distribution
+ var/list/angles = list()
+ // the time this infection was created
+ var/timecreated
+ // the actual build time it takes for this structure to be built in deciseconds
+ var/build_time = 0
+ // if the infection is currently being used to create another type
+ var/building = FALSE
+ // upgrades for the type
+ var/list/upgrades = list()
+ // the types of upgrades
+ var/list/upgrade_types = list()
+ // adds all upgrades of this subtype to upgrade_types
+ var/upgrade_subtype = null
+ // menu handler for the upgrade menus
+ var/datum/infection_menu/menu_handler
+ // if this thing can be stepped on by non blobbies
+ var/canpass_bypass = FALSE
+ //how many crystals does this drop on being destroyed
+ var/crystal_drop = 0
+ // types of objects to eat
+ var/list/types_to_eat = list(/obj/singularity,
+ /obj/singularity/energy_ball,
+ /obj/machinery/power/supermatter_crystal,
+ /obj/machinery/gravity_generator)
+
+/obj/structure/infection/Initialize(mapload, owner_overmind)
+ . = ..()
+ if(owner_overmind)
+ overmind = owner_overmind
+ else if(GLOB.infection_commander)
+ overmind = GLOB.infection_commander
+ GLOB.infections += src //Keep track of the structure in the normal list either way
+ setDir(pick(GLOB.cardinals))
+ update_icon()
+ if(atmosblock)
+ air_update_turf(1)
+ ConsumeTile()
+ timecreated = world.time
+ AddComponent(/datum/component/no_beacon_crossing)
+ generate_upgrades()
+ menu_handler = new /datum/infection_menu(src)
+
+/*
+ Generates the upgrades for the infection from the types
+*/
+/obj/structure/infection/proc/generate_upgrades()
+ if(ispath(upgrade_subtype))
+ upgrade_types += subtypesof(upgrade_subtype)
+ for(var/upgrade_type in upgrade_types)
+ upgrades += new upgrade_type()
+
+/*
+ Opens the evolution menu for the commander that clicked on this
+*/
+/obj/structure/infection/proc/evolve_menu(var/mob/camera/commander/C)
+ if(C == overmind)
+ menu_handler.ui_interact(overmind)
+
+/*
+ Automatically purchases the highest levels of every upgrade on this infection for free
+*/
+/obj/structure/infection/proc/max_upgrade()
+ for(var/datum/infection_upgrade/U in upgrades)
+ var/times = U.times
+ for(var/i = 1 to times)
+ U.do_upgrade(src)
+
+/*
+ When this is first created, do this
+*/
+/obj/structure/infection/proc/creation_action()
+ return
+
+/obj/structure/infection/Destroy()
+ if(atmosblock)
+ atmosblock = FALSE
+ air_update_turf(1)
+ GLOB.infections -= src //it's no longer in the all infections list either
+ var/turf/T = get_turf(src)
+ for(var/i in 1 to crystal_drop)
+ new /obj/item/crystal_shards(T)
+ var/list/stored_contents = list()
+ if(T)
+ stored_contents = T.contents
+ . = ..()
+ for(var/atom/movable/M in stored_contents)
+ Uncrossed(M) // so the overlay and move speed effects don't stay after destruction
+
+/obj/structure/infection/blob_act()
+ return
+
+/obj/structure/infection/singularity_act()
+ return
+
+/obj/structure/infection/tesla_act(power)
+ . = ..()
+ return
+
+/*
+ Attempts to eat nearby problem / important objects
+*/
+
+/obj/structure/infection/proc/eat_nearby()
+ var/list/contents_adjacent = urange(1, src)
+ var/to_eat = null
+ for(var/type in types_to_eat)
+ for(var/thing in contents_adjacent)
+ if(istype(thing, type))
+ to_eat = thing
+ break
+ if(to_eat)
+ break
+ if(to_eat)
+ for(var/mob/M in range(10,src))
+ if(M.client)
+ flash_color(M.client, "#FB6B00", 1)
+ shake_camera(M, 4, 3)
+ playsound(src.loc, pick('sound/effects/curseattack.ogg', 'sound/effects/curse1.ogg', 'sound/effects/curse2.ogg', 'sound/effects/curse3.ogg', 'sound/effects/curse4.ogg',), 300, 1, pressure_affected = FALSE)
+ visible_message("")
+ qdel(to_eat)
+
+/obj/structure/infection/singularity_pull()
+ return
+
+/obj/structure/infection/Adjacent(var/atom/neighbour)
+ . = ..()
+ if(.)
+ var/result = 0
+ var/direction = get_dir(src, neighbour)
+ var/list/dirs = list("[NORTHWEST]" = list(NORTH, WEST), "[NORTHEAST]" = list(NORTH, EAST), "[SOUTHEAST]" = list(SOUTH, EAST), "[SOUTHWEST]" = list(SOUTH, WEST))
+ for(var/A in dirs)
+ if(direction == text2num(A))
+ for(var/B in dirs[A])
+ var/C = locate(/obj/structure/infection) in get_step(src, B)
+ if(C)
+ result++
+ . -= result - 1
+
+/obj/structure/infection/BlockSuperconductivity()
+ return atmosblock
+
+/obj/structure/infection/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover) && (mover.pass_flags & PASSBLOB))
+ return ..()
+ return canpass_bypass
+
+/obj/structure/infection/CanAtmosPass(turf/T)
+ // override for shield blobs etc
+ return !atmosblock
+
+/obj/structure/infection/CanAStarPass(ID, dir, caller)
+ . = FALSE
+ if(ismovable(caller))
+ var/atom/movable/mover = caller
+ . = . || (mover.pass_flags & PASSBLOB)
+
+/obj/structure/infection/Crossed(atom/movable/mover)
+ . = ..()
+ mover.inertia_dir = 0
+
+/obj/structure/infection/update_icon() //Updates color based on overmind color if we have an overmind.
+ if(overmind)
+ add_atom_colour(overmind.infection_color, FIXED_COLOUR_PRIORITY)
+ else
+ remove_atom_colour(FIXED_COLOUR_PRIORITY)
+
+/obj/structure/infection/process()
+ Life()
+
+/*
+ Life, pretty much the same as process
+*/
+/obj/structure/infection/proc/Life()
+ return
+
+/*
+ Resets the angles to expand on because you can't use initial() on lists
+*/
+/obj/structure/infection/proc/reset_angles()
+ angles = list(0,15,30,45,60,75,90,105,120,135,150,165,180,195,210,225,240,255,270,285,300,315,330,345) // this is aids but you cant use initial() on lists so :shrug: i'd rather not loop
+
+/*
+ Expands normal infection in the area around this infection
+*/
+/obj/structure/infection/proc/Pulse_Area(mob/camera/commander/pulsing_overmind, claim_range = 6, count = 6, space_expand = FALSE)
+ if(QDELETED(pulsing_overmind))
+ pulsing_overmind = overmind
+ Be_Pulsed()
+ ConsumeTile()
+ next_pulse = world.time + pulse_cooldown
+ for(var/i = 1 to count)
+ if(!angles.len)
+ reset_angles()
+ var/angle = pick(angles)
+ angles -= angle
+ angle += rand(-7, 7)
+ var/turf/check = src
+ for(var/j = 1 to claim_range)
+ check = locate(src.x + cos(angle) * j, src.y + sin(angle) * j, src.z)
+ if(!check || check.is_transition_turf())
+ check = locate(src.x + cos(angle) * (j - 1), src.y + sin(angle) * (j - 1), src.z)
+ break
+ if(!check)
+ continue
+ var/list/toaffect = getline(src, check)
+ var/obj/structure/infection/previous = src
+ if(!toaffect)
+ continue
+ for(var/j = 2 to toaffect.len)
+ var/obj/structure/infection/INF = locate(/obj/structure/infection) in toaffect[j]
+ if(!INF)
+ var/dir_to_next = get_dir(toaffect[j-1], toaffect[j])
+ // okay i know we said we were totally going to expand to toaffect[j] but cardinals look cleaner (connectivity) so we'll check if those are empty
+ var/turf/finalturf = get_final_expand_turf(toaffect[j-1], toaffect[j], dir_to_next)
+ previous.expand(finalturf, overmind, space_expand)
+ break
+ if(iswallturf(INF.loc))
+ INF.loc.blob_act(INF)
+ INF.air_update_turf(1)
+ INF.Be_Pulsed()
+ INF.ConsumeTile()
+ previous = INF
+
+/*
+ Correct the infection expansion to only occur at cardinals after we actually reach the end
+ Done like this to save processing over the original blob which used rangeturfs (sucks for efficiency)
+*/
+/obj/structure/infection/proc/get_final_expand_turf(var/turf/lastturf, var/turf/finalturf, var/dir_to_next)
+ var/list/checkturfs = list()
+ if(dir_to_next in GLOB.diagonals)
+ var/list/random_cardinals = GLOB.cardinals.Copy()
+ while(random_cardinals.len)
+ var/checkdir = pick_n_take(random_cardinals)
+ if(dir_to_next & checkdir)
+ checkturfs += get_step(lastturf, checkdir)
+ for(var/turf/checkturf in checkturfs)
+ if(locate(/obj/structure/infection) in checkturf.contents)
+ continue
+ return checkturf
+ return finalturf
+
+/*
+ What happens when this infection structure is passed over by an expanding nodes lines
+*/
+/obj/structure/infection/proc/Be_Pulsed()
+ obj_integrity = min(max_integrity, obj_integrity+health_regen)
+ update_icon()
+ var/turf/T = get_turf(src)
+ if(istype(T, /turf/open/chasm) || istype(T, /turf/open/space))
+ T = T.ChangeTurf(/turf/open/floor/plating)
+ T.air_update_turf(1)
+
+/*
+ Consumes the contents of the tile this infection is on
+*/
+/obj/structure/infection/proc/ConsumeTile()
+ eat_nearby()
+ for(var/obj/O in loc)
+ if(istype(O, /obj/structure/infection))
+ continue
+ if(istype(O, /obj/effect))
+ continue
+ if(ismecha(O))
+ continue
+ if(iswallturf(loc))
+ loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it
+
+/*
+ Attack animation for infection expansion
+*/
+/obj/structure/infection/proc/infection_attack_animation(atom/A = null) //visually attacks an atom
+ var/obj/effect/temp_visual/infection/O = new /obj/effect/temp_visual/infection(src.loc)
+ O.setDir(dir)
+ if(overmind)
+ O.color = overmind.infection_color
+ if(A)
+ O.do_attack_animation(A) //visually attack the whatever
+ return O //just in case you want to do something to the animation.
+
+/*
+ Check if we can expand on the tile, then create a normal infection there
+*/
+/obj/structure/infection/proc/expand(turf/T = null, controller = null, space_expand = FALSE)
+ infection_attack_animation(T)
+ // do not expand to areas that are space, unless we're very lucky or the core
+ if(isspaceturf(T) && !(locate(/obj/structure/lattice) in T) && !space_expand && !(locate(/obj/structure/beacon_generator) in T) && prob(80))
+ return
+ if(locate(/obj/structure/beacon_wall) in T.contents || locate(/obj/structure/infection) in T.contents)
+ return
+ var/obj/structure/infection/I = new /obj/structure/infection/normal(src.loc, (controller || overmind))
+ I.density = TRUE
+ if(T.Enter(I,src))
+ I.density = initial(I.density)
+ I.forceMove(T)
+ I.update_icon()
+ I.ConsumeTile()
+ if(T.dynamic_lighting == FALSE)
+ T.dynamic_lighting = TRUE
+ T.lighting_build_overlay()
+ T = T.ChangeTurf(/turf/open/floor/plating)
+ T.air_update_turf(1)
+ return I
+ else
+ T.blob_act(src)
+ for(var/obj/structure/S in T)
+ S.blob_act(src)
+ for(var/obj/machinery/M in T)
+ M.blob_act(src)
+ qdel(I)
+ return null
+
+/obj/structure/infection/emp_act(severity)
+ . = ..()
+ return
+
+/obj/structure/infection/ex_act(severity)
+ take_damage(30/severity * 4, BRUTE, "bomb", 0)
+
+/obj/structure/infection/extinguish()
+ ..()
+ return
+
+/obj/structure/infection/hulk_damage()
+ return 15
+
+/obj/structure/infection/attack_animal(mob/living/simple_animal/M)
+ if(ROLE_INFECTION in M.faction) //sorry, but you can't kill the infection as an infectious creature
+ return
+ ..()
+
+/obj/structure/infection/attacked_by(obj/item/I, mob/living/user)
+ if(ROLE_INFECTION in user.faction) //sorry, but you can't kill the infection as an infectious creature
+ return
+ ..()
+
+/obj/structure/infection/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(damage_amount)
+ playsound(src.loc, pick('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg'), 50, 1)
+ else
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ if(BURN)
+ playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
+
+/obj/structure/infection/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
+ switch(damage_type)
+ if(BRUTE)
+ damage_amount *= brute_resist
+ if(BURN)
+ damage_amount *= fire_resist
+ if(CLONE)
+ else
+ return 0
+ var/armor_block = 0
+ if(damage_flag)
+ armor_block = armor.getRating(damage_flag)
+ damage_amount = round(damage_amount * (100 - armor_block)*0.01, 0.1)
+ return damage_amount
+
+/obj/structure/infection/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+ . = ..()
+ if(. && obj_integrity > 0)
+ update_icon()
+
+/obj/structure/infection/obj_destruction(damage_flag)
+ ..()
+
+/*
+ Handles building times and animations
+ Used for changing types of infection into other types
+*/
+/obj/structure/infection/proc/change_to(type, controller, structure_build_time)
+ if(!ispath(type))
+ throw EXCEPTION("change_to(): invalid type for infection")
+ return
+ if(building)
+ return // no
+ var/obj/structure/infection/I = new type(null, controller)
+ if(structure_build_time == null)
+ structure_build_time = I.build_time
+ var/obj/effect/overlay/vis/newicon = new
+ newicon.icon = initial(I.icon)
+ newicon.icon_state = initial(I.icon_state)
+ newicon.dir = initial(I.dir)
+ newicon.pixel_x = initial(I.pixel_x)
+ newicon.pixel_y = initial(I.pixel_y)
+ newicon.layer = TABLE_LAYER
+ if(overmind)
+ newicon.color = overmind.infection_color
+ var/default_transform = I.transform
+ newicon.transform = I.transform.Scale(0.5, 0.5)
+ animate(newicon, transform = default_transform, time = structure_build_time)
+ vis_contents += newicon
+ name = "building [I.name]"
+ building = type
+ density = TRUE
+ brute_resist = 2
+ fire_resist = 2
+ qdel(I)
+ sleep(structure_build_time)
+ I = new type(src.loc, controller)
+ I.creation_action()
+ I.update_icon()
+ I.setDir(dir)
+ qdel(src)
+ return I
+
+/*
+ The actual standard infection that is created when things expand
+*/
+/obj/structure/infection/normal
+ name = "infection creep"
+ icon_state = "normal"
+ layer = TURF_LAYER
+ light_range = 2
+ obj_integrity = 25
+ max_integrity = 25
+ health_regen = 3
+ canpass_bypass = TRUE
+ // time in deciseconds for overlay on entering and exiting to fade in and fade out
+ var/overlay_fade_time = 20
+
+/obj/structure/infection/normal/evolve_menu(var/mob/camera/commander/C)
+ return
+
+/obj/structure/infection/normal/Crossed(atom/movable/mover)
+ . = ..()
+ if(istype(mover) && (mover.pass_flags & PASSBLOB))
+ return TRUE
+ if(ismob(mover))
+ var/mob/M = mover
+ M.add_movespeed_modifier(MOVESPEED_ID_INFECTION_STRUCTURE, update=TRUE, priority=100, multiplicative_slowdown=1)
+ M.overlay_fullscreen("infectionvision", /obj/screen/fullscreen/curse/infection, 0.4)
+
+/obj/structure/infection/normal/Uncrossed(atom/movable/mover)
+ . = ..()
+ if(!locate(/obj/structure/infection/normal) in get_turf(mover))
+ if(ismob(mover))
+ var/mob/M = mover
+ M.remove_movespeed_modifier(MOVESPEED_ID_INFECTION_STRUCTURE, update = TRUE)
+ M.clear_fullscreen("infectionvision", overlay_fade_time)
+
+/obj/structure/infection/normal/update_icon()
+ ..()
+ if(building)
+ return
+ if(obj_integrity <= 15)
+ icon_state = "normal"
+ name = "fragile infection creep"
+ desc = "A thin lattice of slightly twitching tendrils."
+ else if (overmind)
+ icon_state = "normal"
+ name = "infection"
+ desc = "A thick carpet of writhing tendrils."
+ else
+ icon_state = "normal"
+ name = "dead infection creep"
+ desc = "A thick carpet of lifeless tendrils."
+ light_range = 0
diff --git a/code/modules/antagonists/infection/infection/powers.dm b/code/modules/antagonists/infection/infection/powers.dm
new file mode 100644
index 000000000000..a01bb90e7988
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/powers.dm
@@ -0,0 +1,249 @@
+GLOBAL_LIST_EMPTY(infection_spawns)
+GLOBAL_LIST_EMPTY(infection_gravity_spawns)
+
+/datum/map_template/infection_start
+ name = "Infection Start"
+ mappath = '_maps/templates/infection_spawn.dmm'
+
+/obj/effect/landmark/infection_start
+ name = "infection start"
+ icon_state = "infection_start"
+
+/obj/effect/landmark/infection_start/Initialize(mapload)
+ ..()
+ GLOB.infection_spawns += get_turf(src)
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/landmark/infection_gravity_spawn
+ name = "infection gravity spawn"
+ icon_state = "infection_gravity"
+
+/obj/effect/landmark/infection_gravity_spawn/Initialize(mapload)
+ ..()
+ GLOB.infection_gravity_spawns += get_turf(src)
+ return INITIALIZE_HINT_QDEL
+
+////////////////////////
+// Overmind Abilities //
+////////////////////////
+
+/*
+ Places the infection core but delayed and gives a tell with the shuttle ripples
+*/
+/mob/camera/commander/proc/place_infection_core()
+ if(placed || placing)
+ return
+ placing = TRUE
+ var/turf/start = pick(GLOB.infection_spawns)
+ var/datum/map_template/infection_start/template = new
+ var/list/hit_turfs = template.get_affected_turfs(start, centered = TRUE)
+ var/list/ripples = list()
+ for(var/turf/T in hit_turfs)
+ ripples += new /obj/effect/abstract/ripple(T, 200)
+ sleep(200)
+ for(var/ripple in ripples)
+ qdel(ripple)
+ for(var/turf/T in hit_turfs)
+ for(var/i in 1 to 10)
+ for(var/atom/thing in T.contents)
+ if(isliving(thing))
+ var/mob/M = thing
+ M.visible_message("The infection meteor slams into [M]!")
+ M.gib()
+ else
+ thing.blob_act()
+ template.load(start, centered = TRUE)
+ forceMove(start)
+ var/obj/structure/infection/core/I = new(start, src, base_point_rate, 1)
+ infection_core = I
+ I.update_icon()
+ update_health_hud()
+ reset_perspective()
+ transport_core()
+ placing = FALSE
+ placed = TRUE
+
+/*
+ If the commander can afford to buy this much with infection points
+*/
+/mob/camera/commander/proc/can_buy(cost = 0)
+ if(infection_points < cost)
+ to_chat(src, "You cannot afford this, you need at least [cost] resources!")
+ return FALSE
+ add_points(-cost)
+ return TRUE
+
+/*
+ If the commander can afford to buy this much with upgrade points
+*/
+/mob/camera/commander/proc/can_upgrade(cost = 1)
+ var/diff = upgrade_points - cost
+ if(diff < 0)
+ to_chat(src, "You cannot afford this, you need at least [diff * -1] more upgrade points! Destroy beacons to acquire them!")
+ return FALSE
+ upgrade_points = diff
+ return TRUE
+
+/*
+ Moves the camera to the core
+*/
+/mob/camera/commander/verb/transport_core()
+ set category = "Infection"
+ set name = "Jump to Core"
+ set desc = "Move your camera to your core."
+ if(infection_core)
+ forceMove(infection_core.drop_location())
+
+/*
+ Moves the camera to a selected node
+*/
+/mob/camera/commander/verb/jump_to_node()
+ set category = "Infection"
+ set name = "Jump to Node"
+ set desc = "Move your camera to a selected node."
+ if(GLOB.infection_nodes.len)
+ var/list/nodes = list()
+ for(var/i in 1 to GLOB.infection_nodes.len)
+ var/obj/structure/infection/node/N = GLOB.infection_nodes[i]
+ nodes["Infection Node #[i]"] = N
+ var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
+ var/obj/structure/infection/node/chosen_node = nodes[node_name]
+ if(chosen_node)
+ forceMove(chosen_node.loc)
+
+/*
+ Handles the initial creation of a special type of infection
+*/
+/mob/camera/commander/proc/createSpecial(price, infectionType, nearEquals, needsNode, turf/T)
+ if(!T)
+ T = get_turf(src)
+ var/obj/structure/infection/I = (locate(/obj/structure/infection) in T)
+ if(!I)
+ to_chat(src, "There is no infection here!")
+ return
+ if(!istype(I, /obj/structure/infection/normal))
+ to_chat(src, "Unable to use this infection, find a normal one.")
+ return
+ if(I.building)
+ to_chat(src, "This infection is currently being built on already!")
+ return
+ if(needsNode && nodes_required)
+ if(!(locate(/obj/structure/infection/node) in orange(3, T)) && !(locate(/obj/structure/infection/core) in orange(4, T)))
+ to_chat(src, "You need to place this infection closer to a node or core!")
+ return //handholdotron 2000
+ if(nearEquals)
+ for(var/obj/structure/infection/L in orange(nearEquals, T))
+ if(SAME_INFECTION_TYPE(L, infectionType))
+ to_chat(src, "There is a similar infection nearby, move more than [nearEquals] tiles away from it!")
+ return
+ if(!can_buy(price))
+ return
+ var/obj/structure/infection/N = I.change_to(infectionType, src)
+ return N
+
+/*
+ Attempts to create another spore for the infection commander
+*/
+/mob/camera/commander/proc/create_spore(poll_ghosts = TRUE)
+
+ var/list/mob/dead/observer/candidates = list()
+ if(poll_ghosts)
+ to_chat(src, "Attempting to create a sentient slime...")
+ candidates = pollGhostCandidates("Do you want to play as an evolving infection slime?", ROLE_INFECTION, null, ROLE_INFECTION, 50, POLL_IGNORE_INFECTION_SLIME) //players must answer rapidly
+ if(LAZYLEN(candidates) || !poll_ghosts) //if we got at least one candidate, they're a sentient spore now.
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S = new /mob/living/simple_animal/hostile/infection/infectionspore/sentient(src, null, src)
+ if(poll_ghosts)
+ var/mob/dead/observer/C = pick(candidates)
+ S.key = C.key
+ S.mind.add_antag_datum(/datum/antagonist/infection/spore)
+ var/turf/T = get_turf(src)
+ S.create_respawn_mob(T)
+ if(!infection_core)
+ // roundstart boys get gifts
+ S.add_points(400)
+ to_chat(S, "It costs no points to revert your form before the meteor has landed, explore your evolutions while you have time.")
+ S.update_icons()
+ S.infection_help()
+ infection_mobs += S
+ return S
+ to_chat(src, "You could not conjure a sentience for your slime. Try again later.")
+ upgrade_points++
+ return FALSE
+
+/*
+ Opens the evolution menu
+*/
+/mob/camera/commander/verb/evolve_menu()
+ set category = "Infection"
+ set name = "Evolution"
+ set desc = "Improve yourself and your army to be unstoppable."
+ menu_handler.ui_interact(src)
+
+/*
+ Deletes an infection to give back resources
+*/
+/mob/camera/commander/verb/revert()
+ set category = "Infection"
+ set name = "Remove Infection"
+ set desc = "Removes an infection, giving you back some resources."
+ var/turf/T = get_turf(src)
+ remove_infection(T)
+
+/*
+ Actual proc handling removal of the infection structure
+ Fails if the structure has a negative point return
+*/
+/mob/camera/commander/proc/remove_infection(turf/T)
+ var/obj/structure/infection/I = locate() in T
+ if(!I)
+ to_chat(src, "There is no infection there!")
+ return
+ if(I.point_return < 0)
+ to_chat(src, "Unable to remove this infection.")
+ return
+ if(I.point_return)
+ add_points(I.point_return)
+ to_chat(src, "Gained [I.point_return] resources from removing \the [I].")
+ qdel(I)
+
+/*
+ Moves all spores the camera can see to the point middle clicked on
+*/
+/mob/camera/commander/verb/rally_spores_power()
+ set category = "Infection"
+ set name = "Rally Slimes"
+ set desc = "Rally your slimes to move to a target location."
+ var/turf/T = get_turf(src)
+ rally_spores(T)
+
+/*
+ Actual proc handling moving of the spores to the point clicked
+*/
+/mob/camera/commander/proc/rally_spores(turf/T)
+ to_chat(src, "You direct the slimes you can see.")
+ var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z))
+ if(!surrounding_turfs.len)
+ return
+ for(var/mob/living/simple_animal/hostile/infection/infectionspore/IS in infection_mobs && urange(7, src))
+ if(isturf(IS.loc) && get_dist(IS, T) <= 35)
+ IS.LoseTarget()
+ IS.Goto(pick(surrounding_turfs), IS.move_to_delay)
+
+/*
+ Help guide for playing the infection commander
+*/
+/mob/camera/commander/verb/infection_help()
+ set category = "Infection"
+ set name = "*Infection Help*"
+ set desc = "Help on how to infection."
+ to_chat(src, "As the commander, you command the nearly impossible to kill infection!")
+ to_chat(src, "Your job is to delegate resources. Upgrade your defenses and create an army of sentient slimes. Protect the boss creatures and destroy the beacons to win.")
+ to_chat(src, "Normal Infections will expand your reach and can be upgraded into special infections that perform certain functions.")
+ to_chat(src, "You can upgrade normal infections into various types, using the powers on your action bar.")
+ to_chat(src, "To destroy the beacons, place nodes nearby which will expand on them and drain their power.")
+ to_chat(src, "Destroying beacons grants you upgrade points which can be used to unlock powers in your evolution shop on the HUD.")
+ to_chat(src, "You may also bring corpses of sentient humans to your core in order to convert them into evolving slimes.")
+ to_chat(src, "In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.")
+ to_chat(src, "Shortcuts: Click = Upgrade Infection (Must be near infection) | Middle Mouse Click = Move slimes on screen | Ctrl Click = Create Shield Infection | Alt Click = Remove Infection")
+ if(!placed && autoplace_time <= world.time)
+ to_chat(src, "You will automatically place your core in [DisplayTimeText(max(autoplace_time - world.time, 0))].")
diff --git a/code/modules/antagonists/infection/infection/structures/beamturret.dm b/code/modules/antagonists/infection/infection/structures/beamturret.dm
new file mode 100644
index 000000000000..1eb56386d8b1
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/beamturret.dm
@@ -0,0 +1,59 @@
+/*
+ Beam turrets that lock on with hitscan projectiles and deal constant damage to their target
+*/
+
+/obj/structure/infection/turret/beam
+ name = "infection beam turret"
+ desc = "A tall crystal holding a ball of energy."
+ icon = 'icons/mob/infection/crystaline_infection_medium.dmi'
+ icon_state = "crystalhitscan-layer"
+ pixel_x = -16
+ pixel_y = -4
+ max_integrity = 150
+ point_return = 10
+ upgrade_subtype = /datum/infection_upgrade/beamturret
+ scan_range = 4 // range to search for targets
+ projectile_type = /obj/item/projectile/bullet/infection/beam // the bullet fired for this turret
+ projectile_sound = null
+ hit_sound = 'sound/effects/hitscan_zap.ogg'
+ // the actual beam of the turret, deleted when not firing
+ var/datum/beam/B
+
+/obj/structure/infection/turret/beam/Destroy()
+ qdel(B)
+ return ..()
+
+/obj/structure/infection/turret/beam/update_icon()
+ . = ..()
+ underlays.Cut()
+ var/mutable_appearance/turret_base = mutable_appearance('icons/mob/infection/crystaline_infection_medium.dmi', "crystalhitscan-base")
+ var/mutable_appearance/infection_base = mutable_appearance('icons/mob/infection/infection.dmi', "normal")
+ turret_base.dir = dir
+ infection_base.pixel_x = -pixel_x
+ infection_base.pixel_y = -pixel_y
+ underlays += turret_base
+ underlays += infection_base
+
+/obj/structure/infection/turret/beam/Life()
+ qdel(B)
+ . = ..()
+
+/obj/structure/infection/turret/beam/shootAt(atom/movable/target)
+ . = ..()
+ var/turf/T = get_turf(src)
+ if(T)
+ B = T.Beam(target, icon_state="lightning-hitscan", icon='icons/mob/infection/crystal_effect.dmi', time=INFINITY, maxdistance=scan_range+1, beam_type=/obj/effect/ebeam/infection_beam, beam_sleep_time=1)
+
+/obj/item/projectile/bullet/infection/beam
+ name = "lightning beam"
+ damage = 10
+ damage_type = BURN
+ pass_flags = PASSTABLE | PASSBLOB | PASSGLASS | PASSGRILLE | PASSMOB | PASSCLOSEDTURF
+ hitscan = TRUE
+ flag = "laser"
+ impact_effect_type = null
+
+/obj/effect/ebeam/infection_beam
+ name = "lightning beam"
+ desc = "An extremely painful arc of lightning that seems to stick to anything it touches."
+ mouse_opacity = MOUSE_OPACITY_ICON
\ No newline at end of file
diff --git a/code/modules/antagonists/infection/infection/structures/core.dm b/code/modules/antagonists/infection/infection/structures/core.dm
new file mode 100644
index 000000000000..20f3961b6d92
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/core.dm
@@ -0,0 +1,215 @@
+/*
+ The actual core of the infection that handles many infection processes
+*/
+
+/obj/structure/infection/core
+ name = "infection core"
+ icon = 'icons/mob/infection/crystaline_infection_large.dmi'
+ icon_state = "crystalcore-layer"
+ layer = BELOW_OBJ_LAYER
+ pixel_x = -32
+ pixel_y = -16
+ desc = "A huge towering mass of crystalline matter, Purple matter is pouring out of its base."
+ max_integrity = 400
+ explosion_block = 6
+ point_return = -1
+ health_regen = 0
+ // health regeneration
+ var/core_regen = 2
+ // the delay for the resource gain
+ var/resource_delay = 0
+ // the actual point rate given to the overmind
+ var/point_rate = 2
+ // the nodes that need to pulse their area
+ var/list/topulse = list()
+ // the bodies and minds that we are converting to slimes
+ var/list/converting = list()
+
+/obj/structure/infection/core/Initialize(mapload, client/new_overmind = null, new_rate = 2, placed = 0)
+ if(GLOB.infection_core)
+ return INITIALIZE_HINT_QDEL // just making sure admins can't break everything
+ . = ..()
+ GLOB.infection_core = src
+ GLOB.poi_list |= src
+ update_icon() //so it atleast appears
+ if(!placed && !overmind)
+ return INITIALIZE_HINT_QDEL
+ if(overmind)
+ update_icon()
+ for(var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S in overmind.infection_mobs)
+ S.respawnmob.forceMove(get_turf(src))
+ point_rate = new_rate
+ addtimer(CALLBACK(src, .proc/generate_announcement), 40)
+ for(var/i in GLOB.infection_techs)
+ SSresearch.science_tech.hidden_nodes -= i
+ SSresearch.science_tech.update_node_status(SSresearch.techweb_node_by_id(i))
+ var/datum/supply_pack/to_unlock = SSshuttle.supply_packs[/datum/supply_pack/clearance/targettingcomputer] //will expand on this later if necessary
+ to_unlock.special_enabled = TRUE
+ SSevents.frequency_lower = DOOM_CLOCK_EVENT_DELAY
+ SSevents.frequency_upper = DOOM_CLOCK_EVENT_DELAY
+ SSevents.toggleInfectionmode()
+ SSevents.reschedule()
+ START_PROCESSING(SSobj, src)
+
+/*
+ Info announcement when the core has landed
+*/
+/obj/structure/infection/core/proc/generate_announcement()
+ priority_announce("The entity has landed, we will update you once we find a way to destroy it. \n\
+ Related research has been added to your station's RnD database, \n\
+ Researching crystal shards dropped by infected structures is likely to help massively in sustaining your defense. \n\
+ Additionally, cargo can now order specialized gear from the clearance category.",
+ "CentCom Exotic Materials Research Division", 'sound/effects/crystal_fire.ogg')
+
+/obj/structure/infection/core/evolve_menu(var/mob/camera/commander/C)
+ return
+
+/obj/structure/infection/core/update_icon()
+ cut_overlays()
+ color = null
+ var/mutable_appearance/core_base = mutable_appearance('icons/mob/infection/crystaline_infection_large.dmi', "crystalcore-base")
+ var/mutable_appearance/core_crystal = mutable_appearance('icons/mob/infection/crystaline_infection_large.dmi', "crystalcore-layer")
+ if(overmind)
+ core_crystal.color = overmind.infection_color
+ add_overlay(core_base)
+ add_overlay(core_crystal)
+
+/obj/structure/infection/core/Destroy()
+ playsound(src, 'sound/machines/clockcult/ark_scream.ogg', 60, 1, 10, pressure_affected = FALSE)
+ visible_message(span_boldwarning("Cracks begin to quickly develop across the entirety of [src]'s surface, and it begins resonating at an unearthly frequency!"))
+ sleep(5 SECONDS)
+ deathExplosion()
+ GLOB.infection_core = null
+ if(overmind)
+ overmind.infection_core = null
+ overmind = null
+ STOP_PROCESSING(SSobj, src)
+ GLOB.poi_list -= src
+ SSevents.toggleInfectionmode()
+ . = ..()
+
+/*
+ Death explosion when the core has been destroyed
+*/
+/obj/structure/infection/core/proc/deathExplosion()
+ playsound(loc, 'sound/magic/repulse.ogg', 100, 1, 10, pressure_affected = FALSE)
+ explosion(src, 10, 20, 30, 40, FALSE, TRUE, 5, TRUE, FALSE)
+ for(var/obj/structure/infection/I in orange(20, src))
+ if(istype(I, /obj/structure/infection/core))
+ continue
+ qdel(I)
+
+/obj/structure/infection/core/ex_act(severity, target)
+ return
+
+/obj/structure/infection/core/bullet_act(obj/item/projectile/P)
+ // doesn't include infectionkiller for a reason, ranged weapons killing the core is just kind of lame (unless they smash it with the gun of course)
+ var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(loc, src)
+ var/random_x = rand(-32, 32)
+ AT.pixel_x += random_x
+
+ var/random_y = rand(-32, 32)
+ AT.pixel_y += random_y
+ playsound(loc, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1, 10, pressure_affected = FALSE)
+ visible_message(span_notice("[P] plinks off of [src]!"))
+
+/obj/structure/infection/core/attacked_by(obj/item/I, mob/living/user)
+ if(!istype(I, /obj/item/infectionkiller))
+ var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(loc, src)
+ var/random_x = rand(-32, 32)
+ AT.pixel_x += random_x
+
+ var/random_y = rand(-32, 32)
+ AT.pixel_y += random_y
+ playsound(src.loc, 'sound/effects/bang.ogg', 100, 1, 10, pressure_affected = FALSE)
+ user.visible_message(span_warning("[user]'s [I] plinks off of [src]!"), span_notice("[user]'s [I] plinks off of [src]!"))
+ return
+ if(I.force)
+ visible_message(span_danger("A mass of cracks appear in [src] as [user] hits it with [I]!"), null, null, COMBAT_MESSAGE_RANGE)
+ //only witnesses close by and the victim see a hit message.
+ log_combat(user, src, "attacked", I)
+ take_damage(I.force*5, I.damtype, "melee", 1, override = "infection_core")
+
+/obj/structure/infection/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, override = "")
+ if(override != "infection_core") // we wanna be really really really sure that this doesn't die from other things
+ return
+ . = ..()
+ if(obj_integrity > 0)
+ if(overmind) //we should have an overmind, but...
+ overmind.update_health_hud()
+
+/obj/structure/infection/core/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ for(var/mob/M in range(10,src))
+ if(M.client)
+ flash_color(M.client, "#FB6B00", 1)
+ shake_camera(M, 4, 3)
+ playsound(src.loc, pick('sound/effects/curseattack.ogg', 'sound/effects/curse1.ogg', 'sound/effects/curse2.ogg', 'sound/effects/curse3.ogg', 'sound/effects/curse4.ogg',), 300, 1, pressure_affected = FALSE)
+
+/obj/structure/infection/core/Life()
+ if(QDELETED(src))
+ return
+ if(!overmind)
+ qdel(src)
+ else
+ if(resource_delay <= world.time)
+ resource_delay = world.time + 10 // 1 second
+ overmind.add_points(point_rate)
+ obj_integrity = min(max_integrity, obj_integrity+core_regen)
+ if(overmind)
+ overmind.update_health_hud()
+ Pulse_Area(overmind, 24, 40, TRUE)
+ for(var/mob/living/carbon/C in urange(4, src))
+ if(C.stat != DEAD || isnull(C.mind) || converting.Find(C.mind))
+ continue
+ converting.Add(C.mind)
+ INVOKE_ASYNC(src, .proc/convert_carbon, C)
+ INVOKE_ASYNC(src, .proc/pulseNodes)
+ playsound(loc, 'sound/effects/singlebeat.ogg', 100, 1, pressure_affected = FALSE)
+ ..()
+
+/*
+ Attempts to convert the carbon mob into an infection slime
+*/
+/obj/structure/infection/core/proc/convert_carbon(mob/living/carbon/C)
+ var/timeleft = world.time + CORE_CONVERSION_TIME
+ C.visible_message(span_notice("[src] begins to draw something from [C] as they enter its radius!"))
+ var/stored_mind = C.mind
+ var/turf/T = get_turf(src)
+ var/datum/beam/B = T.Beam(C, icon_state="drain_life", time=INFINITY, maxdistance=INFINITY)
+ while(timeleft > world.time)
+ sleep(10)
+ if(!C || get_dist(src, C) > 4)
+ converting.Remove(stored_mind)
+ qdel(B)
+ return
+ qdel(B)
+ C.visible_message(span_notice("[C] disintegrates as [src] begins to glow brighter..."))
+ C.dust()
+ converting.Remove(stored_mind)
+ overmind.create_spore()
+
+/*
+ Pulses the nodes that have requested to expand, delays them so they don't all occur at once
+*/
+/obj/structure/infection/core/proc/pulseNodes()
+ if(topulse.len)
+ var/sleeptime = SSobj.wait / topulse.len // constant expansion till the next life tick
+ for(var/i = 1 to topulse.len)
+ if(!topulse.len)
+ return
+ var/obj/structure/infection/node/N = pick(topulse)
+ N.Pulse_Area(overmind)
+ topulse -= N
+ sleep(sleeptime)
+
+/obj/structure/infection/core/change_to(type, controller, structure_build_time)
+ return FALSE
+
+/obj/structure/infection/core/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/stationloving, FALSE, TRUE)
+
+/obj/structure/infection/core/onTransitZ(old_z, new_z)
+ if(overmind && is_station_level(new_z))
+ overmind.forceMove(get_turf(src))
+ return ..()
diff --git a/code/modules/antagonists/infection/infection/structures/factory.dm b/code/modules/antagonists/infection/infection/structures/factory.dm
new file mode 100644
index 000000000000..cc20a408e260
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/factory.dm
@@ -0,0 +1,65 @@
+/*
+ A factory that creates spores used to defend the infection
+*/
+
+/obj/structure/infection/factory
+ name = "factory infection"
+ icon = 'icons/mob/infection/crystaline_infection_medium.dmi'
+ icon_state = "crystalinvasion-layer"
+ desc = "A thick spire of crystalline mass, this one appears more brittle than the rest."
+ pixel_x = -16
+ pixel_y = 0
+ max_integrity = 200
+ health_regen = 1
+ point_return = 5
+ build_time = 100
+ upgrade_subtype = /datum/infection_upgrade/factory
+ crystal_drop = 4
+ // spores the factory has spawned
+ var/list/spores = list()
+ // the maximum spores that can be spawned
+ var/max_spores = 3
+ // the delay in the spores spawning
+ var/spore_delay = 0
+ // the added delay to spore delay
+ var/spore_cooldown = 80
+
+/obj/structure/infection/factory/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/infection/factory/update_icon()
+ . = ..()
+ underlays.Cut()
+ var/mutable_appearance/factory_base = mutable_appearance('icons/mob/infection/crystaline_infection_medium.dmi', "crystalinvasion-base")
+ var/mutable_appearance/infection_base = mutable_appearance('icons/mob/infection/infection.dmi', "normal")
+ infection_base.pixel_x = -pixel_x
+ infection_base.pixel_y = -pixel_y
+ underlays += factory_base
+ underlays += infection_base
+
+/obj/structure/infection/factory/Destroy()
+ var/turf/T = get_turf(src)
+ var/amount = rand(1, 4)
+ for(var/i in 1 to amount)
+ new /obj/item/crystal_shards(T)
+ for(var/mob/living/simple_animal/hostile/infection/infectionspore/spore in spores)
+ if(spore.factory == src)
+ spore.factory = null
+ spore.death()
+ spores = null
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/structure/infection/factory/Be_Pulsed()
+ . = ..()
+ if(spores.len >= max_spores)
+ return
+ if(spore_delay > world.time)
+ return
+ flick(pick("crystalinvasion-effect", "crystalinvasion-effect-2"), src)
+ spore_delay = world.time + spore_cooldown
+ var/mob/living/simple_animal/hostile/infection/infectionspore/IS = new/mob/living/simple_animal/hostile/infection/infectionspore(src.loc, src, overmind)
+ if(overmind) //if we don't have an overmind, we don't need to do anything but make a spore
+ IS.update_icons()
+ overmind.infection_mobs.Add(IS)
diff --git a/code/modules/antagonists/infection/infection/structures/node.dm b/code/modules/antagonists/infection/infection/structures/node.dm
new file mode 100644
index 000000000000..96684347d428
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/node.dm
@@ -0,0 +1,90 @@
+/*
+ A main component of the infection that is used to expand it's territory
+*/
+
+/obj/structure/infection/node
+ name = "infection node"
+ desc = "A large, pulsing crystal. A vile purple substance is pouring out its base."
+ icon = 'icons/mob/infection/crystaline_infection_large.dmi'
+ icon_state = "crystalnode-layer"
+ pixel_x = -32
+ pixel_y = -24
+ max_integrity = 200
+ health_regen = 3
+ point_return = 5
+ build_time = 150
+ upgrade_subtype = /datum/infection_upgrade/node
+ crystal_drop = 3
+ // range of the expansion
+ var/expansion_range = 8
+ // amount of the node expands each pulse
+ var/expansion_amount = 12
+ // whether or not the node creates shields around it automatically
+ var/shield_creation = FALSE
+
+/obj/structure/infection/node/Initialize()
+ GLOB.infection_nodes += src
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/infection/node/Pulse_Area(mob/camera/commander/pulsing_overmind)
+ ..(overmind, expansion_range, expansion_amount)
+ pulse_effect()
+
+/obj/structure/infection/node/update_icon()
+ . = ..()
+ underlays.Cut()
+ var/mutable_appearance/node_base = mutable_appearance('icons/mob/infection/crystaline_infection_large.dmi', "crystalnode-base")
+ var/mutable_appearance/infection_base = mutable_appearance('icons/mob/infection/infection.dmi', "normal")
+ infection_base.pixel_x = -pixel_x
+ infection_base.pixel_y = -pixel_y
+ infection_base.transform = transform.Invert() // reverse the transformation on the mini node
+ underlays += node_base
+ underlays += infection_base
+
+/obj/structure/infection/node/Destroy()
+ . = ..()
+ GLOB.infection_nodes -= src
+ STOP_PROCESSING(SSobj, src)
+
+/obj/structure/infection/node/Life()
+ update_icon()
+ if(shield_creation)
+ for(var/obj/structure/infection/normal/N in orange(1, src))
+ if(prob(25))
+ INVOKE_ASYNC(N, .proc/change_to, /obj/structure/infection/shield, overmind)
+ if(overmind && world.time >= next_pulse)
+ overmind.infection_core.topulse += src
+
+/*
+ The effect that occurs when the node pulses
+*/
+/obj/structure/infection/node/proc/pulse_effect()
+ playsound(src.loc, 'sound/effects/singlebeat.ogg', 600, 1, pressure_affected = FALSE)
+ var/state_chosen = prob(50) ? "right" : "left"
+ flick("crystalnode-layer-[state_chosen]", src)
+
+/obj/structure/infection/node/mini
+ name = "miniature infection node"
+ desc = "A smaller, pulsing crystal. Its structure is rapidly degrading."
+ icon = 'icons/mob/infection/crystaline_infection_large.dmi'
+ icon_state = "crystalnode-layer"
+ transform = matrix(0.5, 0, 0, 0, 0.5, 0)
+ max_integrity = 50
+ health_regen = 2
+ point_return = 0
+ upgrade_subtype = null
+ crystal_drop = 0
+ expansion_range = 6
+ expansion_amount = 6
+
+/obj/structure/infection/node/mini/Initialize()
+ . = ..()
+ INVOKE_ASYNC(src, .proc/change_to_normal)
+
+/*
+ Changes the mini node to a normal infection after its life cycle has ended
+*/
+/obj/structure/infection/node/mini/proc/change_to_normal()
+ sleep(300)
+ change_to(/obj/structure/infection/normal, overmind)
diff --git a/code/modules/antagonists/infection/infection/structures/resource.dm b/code/modules/antagonists/infection/infection/structures/resource.dm
new file mode 100644
index 000000000000..ea2f44bc579b
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/resource.dm
@@ -0,0 +1,54 @@
+/*
+ Creates infectionm points for the overmind
+*/
+
+/obj/structure/infection/resource
+ name = "resource infection"
+ desc = "A chunk of crystalline mass that appears to be drawing something in from the surrounding infestion."
+ icon = 'icons/mob/infection/crystaline_infection_medium.dmi'
+ icon_state = "crystalresource-layer"
+ pixel_x = -16
+ pixel_y = -8
+ max_integrity = 60
+ point_return = 5
+ build_time = 50
+ upgrade_subtype = /datum/infection_upgrade/resource
+ crystal_drop = 1
+ // delay in resource gain
+ var/resource_delay = 0
+ // the amount that this resource gains to its point return every time it pulses
+ var/point_return_gain = 0
+
+/obj/structure/infection/resource/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/infection/resource/creation_action()
+ if(overmind)
+ overmind.resource_infection += src
+
+/obj/structure/infection/resource/Destroy()
+ var/turf/T = get_turf(src)
+ var/amount = rand(1, 4)
+ for(var/i in 1 to amount)
+ new /obj/item/crystal_shards(T)
+ if(overmind)
+ overmind.resource_infection -= src
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/structure/infection/resource/update_icon()
+ . = ..()
+ underlays.Cut()
+ var/mutable_appearance/resource_base = mutable_appearance('icons/mob/infection/crystaline_infection_medium.dmi', "crystalresource-base")
+ underlays += resource_base
+
+/obj/structure/infection/resource/Be_Pulsed()
+ . = ..()
+ if(resource_delay > world.time)
+ return
+ flick("crystalresource-layer-on", src)
+ if(overmind)
+ overmind.add_points(1)
+ point_return = min(point_return + point_return_gain, 100)
+ resource_delay = world.time + (overmind ? 40 + overmind.resource_infection.len * 2.5 : 40)
diff --git a/code/modules/antagonists/infection/infection/structures/shield.dm b/code/modules/antagonists/infection/infection/structures/shield.dm
new file mode 100644
index 000000000000..610491c95f6d
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/shield.dm
@@ -0,0 +1,146 @@
+/*
+ Protects the infection from explosions, and is far stronger than a normal infection
+*/
+
+/obj/structure/infection/shield
+ name = "strong infection"
+ desc = "A solid wall of slightly twitching tendrils."
+ icon = 'icons/obj/smooth_structures/infection_wall.dmi'
+ icon_state = "smooth"
+ smooth = SMOOTH_TRUE
+ max_integrity = 150
+ brute_resist = 0.6
+ fire_resist = 0.8
+ explosion_block = 3
+ point_return = 0
+ build_time = 100
+ atmosblock = TRUE
+ // possible weighted crystal colors to display on the shield
+ var/list/crystal_colors = list("#3333aa" = 20, "#33aa33" = 15, "#aa3333" = 15, "#ffffff" = 8, "#822282" = 4, "#444444" = 1)
+ // time requierd to mine the blocc
+ var/mining_time_mod = 8 SECONDS
+ // list of ore drops weighted
+ var/list/ore_drops = list(/obj/item/stack/ore/uranium=2,
+ /obj/item/stack/ore/iron=2,
+ /obj/item/stack/ore/glass/basalt=2,
+ /obj/item/stack/ore/plasma=2,
+ /obj/item/stack/ore/silver=2,
+ /obj/item/stack/ore/gold=2,
+ /obj/item/stack/ore/diamond=2,
+ /obj/item/stack/ore/titanium=2)
+
+/obj/structure/infection/shield/Initialize(mapload)
+ canSmoothWith = typesof(/obj/structure/infection/shield)
+ if(prob(25))
+ var/chosen_crystal = rand(0, 15)
+ var/obj/effect/overlay/vis/crystal_overlay = new
+ crystal_overlay.icon = 'icons/mob/infection/infection.dmi'
+ crystal_overlay.icon_state = "crystal-[chosen_crystal]"
+ crystal_overlay.layer = layer
+ crystal_overlay.color = pickweight(crystal_colors)
+ vis_contents += crystal_overlay
+ . = ..()
+
+/obj/structure/infection/shield/Destroy()
+ var/turf/T = get_turf(src)
+ var/type_of_drop = pickweight(ore_drops)
+ if(type_of_drop && T)
+ var/amount = rand(1, 4)
+ for(var/i in 1 to amount)
+ new type_of_drop(T)
+ . = ..()
+
+/obj/structure/infection/shield/evolve_menu(var/mob/camera/commander/C)
+ return
+
+/obj/structure/infection/shield/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_MINING)
+ var/turf/T = user.loc
+ if (!isturf(T))
+ return
+
+ if(INTERACTING_WITH(user, src))//prevents message spam
+ return
+ to_chat(user, "You start picking...")
+
+ if(I.use_tool(src, user, mining_time_mod, volume=50))
+ to_chat(user, "You slice through the infection.")
+ change_to(/obj/structure/infection/normal, overmind)
+ SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type)
+ return
+ . = ..()
+
+/obj/structure/infection/shield/Bumped(atom/movable/AM)
+ ..()
+ if(ishuman(AM))
+ var/mob/living/carbon/human/H = AM
+ var/obj/item/I = H.is_holding_tool_quality(TOOL_MINING)
+ if(I)
+ attackby(I, H)
+ return
+ else if(iscyborg(AM))
+ var/mob/living/silicon/robot/R = AM
+ if(R.module_active && R.module_active.tool_behaviour == TOOL_MINING)
+ attackby(R.module_active, R)
+ return
+ else
+ return
+
+/*
+ A reflective shield that reflects projectiles back at whatever shot them
+*/
+
+/obj/structure/infection/shield/reflective
+ name = "reflective infection"
+ desc = "A solid wall of reflective crystal. It appears extremely brittle"
+ icon = 'icons/mob/infection/infection.dmi'
+ icon_state = "reflective"
+ smooth = SMOOTH_FALSE
+ flags_1 = CHECK_RICOCHET_1
+ brute_resist = 3
+ fire_resist = 0.2
+ explosion_block = 2
+ mining_time_mod = 4 SECONDS
+
+/obj/structure/infection/shield/reflective/Initialize(mapload)
+ . = ..()
+ canSmoothWith = list()
+ vis_contents.Cut()
+
+/obj/structure/infection/shield/reflective/handle_ricochet(obj/item/projectile/P)
+ if(!istype(P, /obj/item/projectile/beam))
+ return FALSE
+ var/turf/p_turf = get_turf(P)
+ var/face_direction = get_dir(src, p_turf)
+ var/face_angle = dir2angle(face_direction)
+ var/incidence_s = GET_ANGLE_OF_INCIDENCE(face_angle, (P.Angle + 180))
+ var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s)
+ P.setAngle(new_angle_s)
+ if(!(P.reflectable & REFLECT_FAKEPROJECTILE))
+ visible_message("[P] reflects off [src]!")
+ return TRUE
+
+/*
+ A barrier that prevents entry except from infectious creatures and things being pulled by them
+*/
+
+/obj/structure/infection/shield/barrier
+ name = "infection barrier"
+ desc = "A thin mesh barrier preventing voluntary entry of non infectious creatures."
+ icon = 'icons/mob/infection/infection.dmi'
+ icon_state = "door"
+ smooth = SMOOTH_FALSE
+
+/obj/structure/infection/shield/barrier/Initialize(mapload)
+ . = ..()
+ canSmoothWith = list()
+ vis_contents.Cut()
+
+/obj/structure/infection/shield/barrier/CanPass(atom/movable/mover, turf/target)
+ if(istype(mover) && (mover.pass_flags & PASSBLOB))
+ return ..()
+ if(mover.pulledby && isliving(mover.pulledby)) // pulled through by other infection creatures
+ var/mob/living/L = mover.pulledby
+ if(L.pass_flags & PASSBLOB)
+ return TRUE
+ return FALSE
diff --git a/code/modules/antagonists/infection/infection/structures/turret.dm b/code/modules/antagonists/infection/infection/structures/turret.dm
new file mode 100644
index 000000000000..85cbf0f71f67
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/turret.dm
@@ -0,0 +1,176 @@
+/*
+ A turret that fires at enemies that enter its radius
+*/
+
+/obj/structure/infection/turret
+ name = "infection turret"
+ desc = "A tower of crystal with a large hole in the side, exposing the structure within."
+ icon = 'icons/mob/infection/crystaline_infection_medium.dmi'
+ icon_state = "crystalturret-layer"
+ pixel_x = -16
+ pixel_y = -4
+ max_integrity = 150
+ point_return = 10
+ build_time = 100
+ upgrade_subtype = /datum/infection_upgrade/turret
+ crystal_drop = 2
+ // the amount of times the turret will fire every time it finds a target
+ var/frequency = 1
+ // the range that this turret will search to find targets
+ var/scan_range = 8
+ // the projectile shot from this turret
+ var/projectile_type = /obj/item/projectile/bullet/infection
+ // the projectiles sound when it is fired
+ var/projectile_sound = 'sound/effects/crystal_fire.ogg'
+ // the sound when the projectile hits the person
+ var/hit_sound = 'sound/effects/crystal_turret_hitsound.ogg'
+
+/obj/structure/infection/turret/Initialize()
+ . = ..()
+ dir = NORTH
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/infection/turret/Destroy()
+ var/turf/T = get_turf(src)
+ var/amount = rand(1, 4)
+ for(var/i in 1 to amount)
+ new /obj/item/crystal_shards(T)
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/structure/infection/turret/update_icon()
+ . = ..()
+ underlays.Cut()
+ var/mutable_appearance/turret_base = mutable_appearance('icons/mob/infection/crystaline_infection_medium.dmi', "crystalturret-base")
+ var/mutable_appearance/infection_base = mutable_appearance('icons/mob/infection/infection.dmi', "normal")
+ turret_base.dir = dir
+ infection_base.pixel_x = -pixel_x
+ infection_base.pixel_y = -pixel_y
+ underlays += turret_base
+ underlays += infection_base
+
+/obj/structure/infection/turret/Life()
+ if(!overmind)
+ return
+ var/list/targets = list()
+ for(var/mob/A in view(scan_range, src))
+ if(A.invisibility > SEE_INVISIBLE_LIVING)
+ continue
+
+ if(isanimal(A))
+ var/mob/living/simple_animal/SA = A
+ if(SA.stat || in_faction(SA)) //don't target if dead or in faction
+ continue
+ targets += SA
+ continue
+
+ if(issilicon(A))
+ var/mob/living/silicon/sillycone = A
+
+ if(ispAI(A))
+ continue
+
+ if(sillycone.stat || in_faction(sillycone))
+ continue
+
+ targets += sillycone
+ continue
+
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+
+ if(C.stat == DEAD)
+ continue
+
+ if(!in_faction(C))
+ targets += C
+
+ for(var/A in GLOB.mechas_list)
+ if((get_dist(A, src) < scan_range) && can_see(src, A, scan_range))
+ targets += A
+
+ if(targets.len)
+ tryToShootAt(targets)
+
+/*
+ Checks if they're in the infection faction and to ignore them as a target
+*/
+/obj/structure/infection/turret/proc/in_faction(mob/target)
+ if(ROLE_INFECTION in target.faction)
+ return TRUE
+ return FALSE
+
+/*
+ Tries to shoot at the target
+*/
+/obj/structure/infection/turret/proc/tryToShootAt(list/atom/movable/targets)
+ while(targets.len > 0)
+ var/atom/movable/M = pick(targets)
+ targets -= M
+ if(target(M))
+ return 1
+
+/*
+ If we can actually shoot them, queue up all of the shots that need to happen
+*/
+/obj/structure/infection/turret/proc/target(atom/movable/target)
+ if(target && frequency)
+ var/diffTime = SSprocessing.wait / frequency
+ var/timePassed = 0
+ while(timePassed < SSprocessing.wait)
+ setDir(get_dir(src, target)) //even if you can't shoot, follow the target
+ addtimer(CALLBACK(src, .proc/shootAt, target), timePassed)
+ timePassed += diffTime
+ return 1
+ return
+
+/*
+ Actually fire the projectile at the target now
+*/
+/obj/structure/infection/turret/proc/shootAt(atom/movable/target)
+ var/turf/T = get_turf(src)
+ var/turf/U = get_turf(target)
+ if(!istype(T) || !istype(U))
+ return
+
+ setDir(get_dir(src, target))
+ update_icon()
+ var/obj/item/projectile/bullet/infection/A = new projectile_type(T)
+ playsound(loc, projectile_sound, 75, 1, pressure_affected = FALSE)
+ A.hitsound = hit_sound
+
+ //Shooting Code:
+ A.preparePixelProjectile(target, T)
+ A.firer = src
+ A.fired_from = src
+ A.fire()
+ return A
+
+/obj/item/projectile/bullet/infection
+ name = "energy shot"
+ icon = 'icons/mob/infection/crystal_effect.dmi'
+ icon_state = "lightning-projectile"
+ layer = ABOVE_MOB_LAYER
+ damage = 15
+ speed = 2.5
+ damage_type = BRUTE
+ pass_flags = PASSTABLE | PASSBLOB
+ nodamage = FALSE
+ flag = "bullet"
+ hitsound_wall = "ricochet"
+ impact_effect_type = /obj/effect/temp_visual/impact_effect
+
+/obj/item/projectile/bullet/infection/flak
+ name = "energy burst"
+ damage = 10
+ speed = 2
+
+/obj/structure/infection/turret/core
+ name = "core turret"
+ desc = "A turret for the core of the infection, filled with a massive amount of slime."
+ point_return = -1
+ upgrade_subtype = null
+
+/obj/structure/infection/turret/core/Initialize()
+ . = ..()
+ AddComponent(/datum/component/summoning, list(/mob/living/simple_animal/hostile/infection/infectionspore), 10, 4, 0, "forms from the raw energy!", 'sound/effects/blobattack.ogg')
diff --git a/code/modules/antagonists/infection/infection/structures/vacuum.dm b/code/modules/antagonists/infection/infection/structures/vacuum.dm
new file mode 100644
index 000000000000..ab505f943a74
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/structures/vacuum.dm
@@ -0,0 +1,53 @@
+/*
+ A vacuum that pulls in movable objects around it
+*/
+
+/obj/structure/infection/vacuum
+ name = "infection vacuum"
+ desc = "A large uncomfortably shaped crystalline mass with a pulsing void in the center."
+ icon = 'icons/mob/infection/infection.dmi'
+ icon_state = "vacuum"
+ max_integrity = 100
+ health_regen = 3
+ point_return = 10
+ build_time = 100
+ canpass_bypass = TRUE
+ layer = ABOVE_MOB_LAYER
+ upgrade_subtype = /datum/infection_upgrade/vacuum
+ // the range to pull objects from
+ var/suck_range = 7
+
+/obj/structure/infection/vacuum/Initialize()
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+/obj/structure/infection/vacuum/Destroy()
+ . = ..()
+ STOP_PROCESSING(SSobj, src)
+
+/obj/structure/infection/vacuum/Life()
+ update_icon()
+ playsound(src.loc, 'sound/effects/podwoosh.ogg', 10, 1, pressure_affected = FALSE)
+ for(var/atom/movable/M in orange(4, src))
+ if(isliving(M))
+ var/mob/living/L = M
+ if(ROLE_INFECTION in L.faction)
+ continue
+ if(istype(M, /obj/item/infectionkiller))
+ continue
+ if(!M.anchored && !M.pulledby)
+ M.experience_pressure_difference(MOVE_FORCE_VERY_WEAK, get_dir(M, src))
+ for(var/atom/A in get_turf(src)) // eating time
+ if(isliving(A))
+ var/mob/living/L = A
+ if(ROLE_INFECTION in L.faction)
+ continue
+ if(L.stat == DEAD) // left for core to grab
+ continue
+ L.adjustBruteLoss(15)
+ to_chat(L, "You feel a terrible pain as you are slammed into the vacuum!")
+ playsound(src.loc, 'sound/effects/splat.ogg', 100, 1, pressure_affected = FALSE)
+ else
+ A.blob_act()
+
+
diff --git a/code/modules/antagonists/infection/infection/upgrade_menu.dm b/code/modules/antagonists/infection/infection/upgrade_menu.dm
new file mode 100644
index 000000000000..563e37906818
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/upgrade_menu.dm
@@ -0,0 +1,113 @@
+/*
+ Menu system that handles most upgrades for infection gamemode
+*/
+
+/datum/infection_menu
+ // Name that displays on the evolution shop
+ var/name = "Evolution Menu"
+ // The actual thing that we are trying to upgrade
+ var/atom/upgrading
+ // stores the ui we have open
+ var/datum/tgui/ui
+
+/datum/infection_menu/New(upgrading)
+ src.upgrading = upgrading
+ if(istype(upgrading, /obj/structure/infection))
+ return ..()
+ if(istype(upgrading, /mob/living/simple_animal/hostile/infection/infectionspore/sentient))
+ return ..()
+ if(istype(upgrading, /mob/camera/commander))
+ return ..()
+ return INITIALIZE_HINT_QDEL
+
+/*
+ Gets the evolution list for the different types of things that can upgrade
+*/
+/datum/infection_menu/proc/get_evolution_list()
+ if(istype(upgrading, /obj/structure/infection))
+ var/obj/structure/infection/I = upgrading
+ return I.upgrades
+ if(istype(upgrading, /mob/living/simple_animal/hostile/infection/infectionspore/sentient))
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S = upgrading
+ return S.upgrades
+ if(istype(upgrading, /mob/camera/commander))
+ var/mob/camera/commander/C = upgrading
+ return C.unlockable_actions
+ return
+
+/*
+ Gets the points left that can be used to upgrade
+*/
+/datum/infection_menu/proc/get_points_left()
+ if(istype(upgrading, /obj/structure/infection))
+ var/obj/structure/infection/I = upgrading
+ return I.overmind.infection_points
+ if(istype(upgrading, /mob/living/simple_animal/hostile/infection/infectionspore/sentient))
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S = upgrading
+ return S.upgrade_points
+ if(istype(upgrading, /mob/camera/commander))
+ var/mob/camera/commander/C = upgrading
+ return C.upgrade_points
+ return 0
+
+/*
+ Tries to purchase the upgrade with the points the user has
+*/
+/datum/infection_menu/proc/try_purchase(point_cost)
+ if(istype(upgrading, /obj/structure/infection))
+ var/obj/structure/infection/I = upgrading
+ return I.overmind.can_buy(point_cost)
+ if(istype(upgrading, /mob/living/simple_animal/hostile/infection/infectionspore/sentient))
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S = upgrading
+ return S.can_upgrade(point_cost)
+ if(istype(upgrading, /mob/camera/commander))
+ var/mob/camera/commander/C = upgrading
+ return C.can_upgrade(point_cost)
+ return FALSE
+
+/datum/infection_menu/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/infection_menu/ui_interact(mob/user, /datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "infection_menu")
+ ui.open()
+
+/datum/infection_menu/ui_data(mob/user)
+ var/list/data = list()
+
+ var/points_remaining = get_points_left()
+ data["evolution_points"] = points_remaining
+
+ var/list/upgrades = list()
+
+ for(var/datum/infection_upgrade/evolution in get_evolution_list())
+ var/point_cost = evolution.cost
+ if(point_cost <= 0)
+ continue
+ var/list/AL = list()
+ AL["name"] = evolution.name
+ AL["desc"] = evolution.description
+ AL["owned"] = evolution.times <= 0
+ AL["times"] = evolution.times
+ AL["upgrade_cost"] = point_cost
+ AL["can_purchase"] = (points_remaining >= point_cost && !QDELETED(upgrading))
+
+ upgrades += list(AL)
+
+ data["upgrades"] = upgrades
+
+ return data
+
+/datum/infection_menu/ui_act(action, params)
+ if(..())
+ return
+
+ switch(action)
+ if("evolve")
+ var/evolution_name = params["name"]
+ for(var/datum/infection_upgrade/evolution in get_evolution_list())
+ if(evolution.name == evolution_name && evolution.times)
+ if(try_purchase(evolution.cost))
+ evolution.do_upgrade(upgrading)
\ No newline at end of file
diff --git a/code/modules/antagonists/infection/infection/upgrades.dm b/code/modules/antagonists/infection/infection/upgrades.dm
new file mode 100644
index 000000000000..112b223a59f9
--- /dev/null
+++ b/code/modules/antagonists/infection/infection/upgrades.dm
@@ -0,0 +1,349 @@
+/*
+ Datums that store the things that upgrades do as well as the information on them
+*/
+
+/datum/infection_upgrade
+ // name of the upgrade
+ var/name = ""
+ // description of the upgrade
+ var/description = ""
+
+ // cost of the upgrade
+ var/cost = 0
+ // cost that increases every time the upgrade is purchased
+ var/increasing_cost = 0
+ // the amount of times that this upgrade can actually be bought
+ var/times = 1
+ // the amount of times this upgrade has been bought already
+ var/bought = 0
+
+/*
+ Handles pre-upgrade incrementing
+*/
+/datum/infection_upgrade/proc/do_upgrade(atom/parent)
+ times--
+ bought++
+ cost += increasing_cost
+ upgrade_effect(parent)
+ return
+
+/*
+ Actual place to put your upgrade code
+*/
+/datum/infection_upgrade/proc/upgrade_effect(atom/parent)
+ return
+
+///////////////////////
+// Overmind Upgrades //
+///////////////////////
+
+/datum/infection_upgrade/overmind
+ // action type to unlock and add to the commander (if there is one)
+ var/action_type
+
+/datum/infection_upgrade/overmind/upgrade_effect(mob/camera/commander/parentcommander)
+ var/datum/action/cooldown/infection/add_action = new action_type()
+ add_action.Grant(parentcommander)
+
+/datum/infection_upgrade/overmind/turret
+ name = "Turret Infection"
+ description = "Gives you the ability to create turret infection. These automically target any hostile creatures around them, and have various effects to deal with many types of intruders."
+ action_type = /datum/action/cooldown/infection/creator/turret
+ cost = 1
+
+/datum/infection_upgrade/overmind/beamturret
+ name = "Beam Turret Infection"
+ description = "Gives you the ability to create beam turret infection. These automically target and instantly stick to hostile creatures that enter their range."
+ action_type = /datum/action/cooldown/infection/creator/beamturret
+ cost = 1
+
+/datum/infection_upgrade/overmind/reflective
+ name = "Reflective Shield Infection"
+ description = "Gives you the ability to create reflective shield infection. These reflect projectiles back at whatever sent them."
+ action_type = /datum/action/cooldown/infection/creator/reflective
+ cost = 1
+
+/datum/infection_upgrade/overmind/vacuum
+ name = "Vacuum Infection"
+ description = "Gives you the ability to create vacuum infection. Vacuum infection automatically suck in any non-infectious objects, and damage them once they are on top."
+ action_type = /datum/action/cooldown/infection/creator/vacuum
+ cost = 1
+
+/datum/infection_upgrade/overmind/barrier
+ name = "Barrier Infection"
+ description = "Gives you the ability to create barrier infection. These allow infectious creatures to pull objects through them unlike normal walls."
+ action_type = /datum/action/cooldown/infection/creator/barrier
+ cost = 1
+
+/datum/infection_upgrade/overmind/medical
+ name = "Medical Diagnostics System"
+ description = "Allows you to see the health of allies and enemies alike, giving you even greater strategical planning power with your forces."
+ cost = 1
+
+/datum/infection_upgrade/overmind/medical/upgrade_effect(mob/camera/commander/parentcommander)
+ parentcommander.toggle_medical_hud()
+
+/datum/infection_upgrade/overmind/createslime
+ name = "Create Evolving Slime"
+ description = "Attempts to create an evolving slime for your army."
+ cost = 1
+ times = 10
+
+/datum/infection_upgrade/overmind/createslime/upgrade_effect(mob/camera/commander/parentcommander)
+ if(!parentcommander.create_spore())
+ times++
+
+/*
+ Type change spore upgrades, turns the upgrader into the mob type that corresponds to that upgrade
+*/
+
+/datum/infection_upgrade/spore_type_change
+ cost = 200
+ // the type that the spore will change into
+ var/new_type
+
+/datum/infection_upgrade/spore_type_change/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/parentspore)
+ parentspore.transfer_to_type(new_type)
+
+/datum/infection_upgrade/spore_type_change/infector_spore
+ name = "Infector Spore"
+ description = "An underboss of the infection that takes care of tasks like bringing back bodies to the core, or directly advancing the front lines with building upgrades."
+ new_type = /mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector
+
+/datum/infection_upgrade/spore_type_change/hunter_spore
+ name = "Hunter Spore"
+ description = "A fast spore with abilities useful for hunting down humans. Works well with infector spores that can grab humans."
+ new_type = /mob/living/simple_animal/hostile/infection/infectionspore/sentient/hunter
+
+/datum/infection_upgrade/spore_type_change/destructive_spore
+ name = "Destructive Spore"
+ description = "A generally slow, tanky, and damaging spore useful for destroying structures. Effective for defending and advancing infectious structures."
+ new_type = /mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive
+
+/*
+ Upgrade exclusively for the infection spore type
+*/
+
+/datum/infection_upgrade/infector/mininode
+ name = "Miniature Node"
+ description = "Allows you to place down a miniature node that lasts a short time, but expands infection around it like a true node. Comes with normal construction time."
+ cost = 1000
+
+/datum/infection_upgrade/infector/mininode/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector/parentinfector)
+ var/datum/action/cooldown/infection/add_action = new /datum/action/cooldown/infection/mininode()
+ add_action.Grant(parentinfector)
+
+/datum/infection_upgrade/infector/reflective
+ name = "Reflective Shield"
+ description = "Somewhere being attacked? Grants you the ability to create a reflective shield. Comes with normal construction time."
+ cost = 600
+
+/datum/infection_upgrade/infector/reflective/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector/parentinfector)
+ var/datum/action/cooldown/infection/add_action = new /datum/action/cooldown/infection/reflective()
+ add_action.Grant(parentinfector)
+
+/datum/infection_upgrade/infector/spacewalk
+ name = "Compressed Air Storage"
+ description = "The stored air in your body allows you to move anywhere, including space, with ease."
+ cost = 200
+
+/datum/infection_upgrade/infector/spacewalk/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector/parentinfector)
+ parentinfector.spacewalk = TRUE
+
+/datum/infection_upgrade/infector/suction
+ name = "Suction Cups"
+ description = "Pockets of fluid on the sides of your body create suction forces, allowing you to pull objects."
+ cost = 200
+
+/datum/infection_upgrade/infector/suction/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector/parentinfector)
+ parentinfector.verbs += /mob/living/verb/pulled
+
+/datum/infection_upgrade/infector/respawn_time
+ name = "Reduce Respawn Time"
+ description = "Slightly reduces respawn time."
+ cost = 50
+ increasing_cost = 25
+ times = 5
+
+/datum/infection_upgrade/infector/respawn_time/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/infector/parentinfector)
+ parentinfector.respawn_time -= 6 SECONDS
+
+/*
+ Upgrade exclusively for the hunter spore type
+*/
+
+/datum/infection_upgrade/hunter/lifesteal
+ name = "Lifesteal"
+ description = "Does true damage to living targets by sapping health directly from them as well as healing you."
+ cost = 600
+
+/datum/infection_upgrade/hunter/lifesteal/upgrade_effect(atom/parent)
+ parent.AddComponent(/datum/component/lifesteal, 10)
+
+/datum/infection_upgrade/hunter/napalm
+ name = "Burning Fists"
+ description = "Your body now produces a flammable fluid, causing your attacks to pierce armor."
+ cost = 200
+
+/datum/infection_upgrade/hunter/napalm/upgrade_effect(atom/parent)
+ var/mob/living/simple_animal/S = parent
+ S.melee_damage_type = BURN
+ S.armour_penetration = 20
+
+/datum/infection_upgrade/hunter/flash
+ name = "Bright Flash"
+ description = "Gain the ability to create bright flashes of light around you that can disorient opponents without protection."
+ cost = 200
+
+/datum/infection_upgrade/hunter/flash/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/hunter/parenthunter)
+ var/datum/action/cooldown/infection/add_action = new /datum/action/cooldown/infection/flash()
+ add_action.Grant(parenthunter)
+
+/datum/infection_upgrade/hunter/speed
+ name = "Speed Boost"
+ description = "Move faster than your foes can run away."
+ cost = 100
+ increasing_cost = 50
+ times = 5
+
+/datum/infection_upgrade/hunter/speed/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/hunter/parenthunter)
+ parenthunter.set_varspeed(-0.1 * bought)
+
+/datum/infection_upgrade/hunter/damage
+ name = "Damage Increase"
+ description = "Gain the strength to take down your foes."
+ cost = 50
+ increasing_cost = 50
+ times = 5
+
+/datum/infection_upgrade/hunter/damage/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/hunter/parenthunter)
+ parenthunter.melee_damage_lower += 4
+ parenthunter.melee_damage_upper += 4
+
+/*
+ Upgrades exclusively for the destructive spore type
+*/
+
+/datum/infection_upgrade/destructive/hydraulic_fists
+ name = "Hydraulic Fists"
+ description = "The compressed fluid in your arms allows you to deal much greater impacts which throw hit objects backward."
+ cost = 600
+
+/datum/infection_upgrade/destructive/hydraulic_fists/upgrade_effect(atom/parent)
+ parent.AddComponent(/datum/component/knockback, 4)
+
+/datum/infection_upgrade/destructive/lead
+ name = "Lead Muscles"
+ description = "The muscles in your body are converted to a lead based substance, causing you to be almost impossible to move, and making you able to move many things."
+ cost = 200
+
+/datum/infection_upgrade/destructive/lead/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive/parentdestructive)
+ parentdestructive.move_force = MOVE_FORCE_EXTREMELY_STRONG
+ parentdestructive.move_resist = MOVE_FORCE_EXTREMELY_STRONG
+ parentdestructive.pull_force = MOVE_FORCE_EXTREMELY_STRONG
+
+/datum/infection_upgrade/destructive/health
+ name = "Health Boost"
+ description = "Sustain more damage before having to reform."
+ cost = 50
+ increasing_cost = 50
+ times = 6
+
+/datum/infection_upgrade/destructive/health/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive/parentdestructive)
+ parentdestructive.maxHealth += 10
+
+/datum/infection_upgrade/destructive/burn_protection
+ name = "Burn Protection"
+ description = "Take less burn damage."
+ cost = 50
+ increasing_cost = 50
+ times = 5
+
+/datum/infection_upgrade/destructive/burn_protection/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive/parentdestructive)
+ parentdestructive.damage_coeff[BURN] -= 0.1
+
+/datum/infection_upgrade/destructive/brute_protection
+ name = "Brute Protection"
+ description = "Take less brute damage."
+ cost = 50
+ increasing_cost = 50
+ times = 5
+
+/datum/infection_upgrade/destructive/brute_protection/upgrade_effect(mob/living/simple_animal/hostile/infection/infectionspore/sentient/destructive/parentdestructive)
+ parentdestructive.damage_coeff[BRUTE] -= 0.1
+
+/*
+ Upgrade types for the infection turrets
+*/
+
+/datum/infection_upgrade/turret/flak_bullets
+ name = "Flak Bullets"
+ description = "Bullets that hit targets will break into tiny spores that do damage to other living creatures around the target."
+ cost = 50
+
+/datum/infection_upgrade/turret/flak_bullets/upgrade_effect(atom/parent)
+ parent.AddComponent(/datum/component/shrapnel, /obj/item/projectile/bullet/infection/flak, 2)
+
+/*
+ Upgrade types for the infection resource generators
+*/
+
+/datum/infection_upgrade/resource/storage_unit
+ name = "Storage Unit"
+ description = "Increases the point return of this infection every time it produces, up to a maximum of 100 points. You can remove the structure at any time to claim the extra points."
+ cost = 80
+
+/datum/infection_upgrade/resource/storage_unit/upgrade_effect(obj/structure/infection/resource/parentresource)
+ parentresource.point_return_gain += 0.25
+ return
+
+/*
+ Upgrade types for the infection nodes
+*/
+
+/datum/infection_upgrade/node/defensive_shield
+ name = "Defensive Shield"
+ description = "Automatically produces shield infection from all normal infection that are adjacent."
+ cost = 50
+
+/datum/infection_upgrade/node/defensive_shield/upgrade_effect(obj/structure/infection/node/parentnode)
+ parentnode.shield_creation = TRUE
+ return
+
+/datum/infection_upgrade/node/range
+ name = "Expansion Range"
+ description = "Increases the expansion range of the node."
+ cost = 50
+ times = 3
+
+/datum/infection_upgrade/node/range/upgrade_effect(obj/structure/infection/node/parentnode)
+ parentnode.expansion_range += 2
+ return
+
+/datum/infection_upgrade/node/amount
+ name = "Expansion Increase"
+ description = "Makes the node expand more infecton whenever it fires."
+ cost = 50
+ times = 3
+
+/datum/infection_upgrade/node/amount/upgrade_effect(obj/structure/infection/node/parentnode)
+ parentnode.expansion_amount += 4
+ return
+
+/*
+ Upgrade types for the infection factories
+*/
+
+/datum/infection_upgrade/factory
+
+/*
+ Upgrade types for the infection beam turrets
+*/
+
+/datum/infection_upgrade/beamturret
+
+/*
+ Upgrade types for the infection vacuums
+*/
+
+/datum/infection_upgrade/vacuum
diff --git a/code/modules/antagonists/infection/legendaryweapons.dm b/code/modules/antagonists/infection/legendaryweapons.dm
new file mode 100644
index 000000000000..defc36202bfe
--- /dev/null
+++ b/code/modules/antagonists/infection/legendaryweapons.dm
@@ -0,0 +1,262 @@
+/*
+ Legendary weapons, the only weapons strong enough to actually damage the infection core, also come with some cool and unique boons to the player side
+*/
+
+/obj/item/infectionkiller
+ name = "infection killer"
+ desc = "This should not be seen, post an issue on github."
+ icon = 'icons/mob/infection/legendary_weapons.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+ resistance_flags = INDESTRUCTIBLE
+ light_range = 4
+ layer = ABOVE_ALL_MOB_LAYER
+ // if the item should actually be treated as a real legendary, and not just a temporary item
+ var/is_item = TRUE
+
+/obj/item/infectionkiller/Initialize(mapload)
+ . = ..()
+ if(is_item)
+ notify_ghosts("The Legendary Weapon [name] Was Found!", source = src, action = NOTIFY_ORBIT, header = "Legendary Weapon")
+ if(GLOB.infection_core)
+ priority_announce("The Legendary Item \"[name]\" has been discovered somewhere on the station.\n\n\
+ The bluespace radiation present inside the item allows it to be detected by standard issue GPS units.\n\
+ We believe this item contains enough power to destroy the infection core.",
+ "CentCom Exotic Materials Research Division", 'sound/magic/summonitems_generic.ogg')
+ AddComponent(/datum/component/stationloving, FALSE, FALSE)
+ var/obj/item/gps/internal/legendary/L = new /obj/item/gps/internal/legendary(src)
+ L.gpstag = "Legendary [name] Signal"
+ var/obj/item/beacon/B = new /obj/item/beacon(src)
+ B.name = "Legendary [name] Beacon"
+ B.renamed = TRUE
+
+/obj/item/gps/internal/legendary
+ icon_state = null
+ gpstag = "Legendary Signal"
+ desc = "Holds immense power."
+ invisibility = 100
+
+/obj/item/infectionkiller/blob_act()
+ return
+
+/obj/item/infectionkiller/ex_act(severity)
+ return
+
+/obj/item/infectionkiller/can_be_pulled(user, grab_state, force)
+ if(isliving(user))
+ var/mob/living/L = user
+ if(L.faction.Find(ROLE_INFECTION))
+ to_chat(L, "You feel yourself start to disintegrate as you touch the radiant object!")
+ playsound(get_turf(L), 'sound/effects/supermatter.ogg', 50, 1)
+ L.adjustBruteLoss(30)
+ return FALSE
+ return ..()
+
+/obj/item/infectionkiller/melee_attack_chain(mob/user, atom/target, params)
+ if(istype(target, /obj/structure/infection))
+ before_structure_attack(target, user)
+ else if(isliving(target))
+ var/mob/living/L = target
+ if(L.faction.Find(ROLE_INFECTION))
+ before_mob_attack(target, user)
+ . = ..()
+
+/obj/item/infectionkiller/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if(istype(target, /obj/structure/infection))
+ after_structure_attack(target, user)
+ else if(isliving(target))
+ var/mob/living/L = target
+ if(L.faction.Find(ROLE_INFECTION))
+ after_mob_attack(target, user)
+ . = ..()
+/*
+ Is called before an infection mob is attacked
+*/
+/obj/item/infectionkiller/proc/before_mob_attack(mob/living/M, mob/living/user)
+ return
+
+/*
+ Is called before an infection structure is attacked
+*/
+/obj/item/infectionkiller/proc/before_structure_attack(obj/O, mob/living/user)
+ return
+
+/*
+ Is called after the infection structure has been attacked
+*/
+/obj/item/infectionkiller/proc/after_structure_attack(obj/O, mob/living/user)
+ return
+
+/*
+ Is called after the infection mob was attacked
+*/
+/obj/item/infectionkiller/proc/after_mob_attack(mob/living/M, mob/living/user)
+ return
+
+/obj/item/infectionkiller/excaliju
+ name = "Excaliju"
+ desc = "An ancient sword with several runes carved along the blade. Deathblows to infested creatures massively increase its damage for 5 seconds."
+ icon_state = "excaliju"
+ item_state = "excaliju"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ hitsound = 'sound/weapons/wpnHit1.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ force = 25
+ armour_penetration = 50
+ block_chance = 75
+ sharpness = SHARP_EDGED
+ // time until the proc ends
+ var/proctime = 0
+ // variable that stores if the mob was alive before we attacked it
+ var/before_was_alive
+
+/*
+ Checks if the sword is procced, which allows it to do incredible amounts of damage
+*/
+/obj/item/infectionkiller/excaliju/proc/is_procced()
+ if(proctime > world.time)
+ return TRUE
+ return FALSE
+
+/*
+ Plays a sound and starts the proc when you kill an infection mob with this sword, only shows the text if the proc has ended and is starting again
+*/
+/obj/item/infectionkiller/excaliju/proc/proc_start(mob/living/M, mob/living/user)
+ playsound(src.loc, 'sound/weapons/wpnProc.ogg', 300, 1, vary = FALSE, pressure_affected = FALSE)
+ if(!is_procced() && prob(20))
+ to_chat(user, "[pick("DEATH FEARS ME!","PROTECT THE SHRINE!","OLDDD MAAAN WILLAKERRRS!")]")
+ proctime = world.time + 50 // 5 seconds of big ass damage to other infection mobs if you manage to kill one infection mob, chain procs
+ addtimer(CALLBACK(src, .proc/proc_end), 50)
+
+/*
+ Ends the proc and plays a sound to indicate so
+*/
+/obj/item/infectionkiller/excaliju/proc/proc_end()
+ if(is_procced())
+ return
+ playsound(src.loc, 'sound/weapons/emitter2.ogg', 300, 1, vary = FALSE, pressure_affected = FALSE)
+
+/obj/item/infectionkiller/excaliju/before_mob_attack(mob/living/M, mob/living/user)
+ before_was_alive = (M && M.stat != DEAD) // you gotta kill it to get the big power boost
+ if(is_procced())
+ src.force *= 5
+
+/obj/item/infectionkiller/excaliju/after_mob_attack(mob/living/M, mob/living/user)
+ src.force = initial(force)
+ if(!M || M.stat == DEAD && before_was_alive)
+ proc_start(M, user)
+
+/obj/item/infectionkiller/excaliju/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ if(is_procced())
+ user.changeNext_move(CLICK_CD_MELEE * 0.25)
+
+/obj/item/infectionkiller/drill
+ name = "Drill of Legends"
+ desc = "A glowing golden drill, bluespace energies infused into the drill bit allow it to slice thick infection with ease."
+ icon_state = "drilloflegends"
+ item_state = "drilloflegends"
+ lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
+ force = 30
+ armour_penetration = 100
+ tool_behaviour = TOOL_MINING
+ toolspeed = 0.01
+ usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
+ attack_verb = list("hit", "pierced", "sliced", "attacked")
+
+/obj/item/infectionkiller/staff
+ name = "Golden Staff of the Honkmother"
+ desc = "The golden staff of the honkmother, containing a stable bluespace portal to a clown monastary on clown planet."
+ icon = 'icons/obj/guns/magic.dmi'
+ icon_state = "honker"
+ item_state = "honker"
+ lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ color = "#ffbb00"
+ force = 25
+ hitsound = list('sound/items/airhorn.ogg')
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ actions_types = list(/datum/action/item_action/summon_clowns)
+
+/datum/action/item_action/summon_clowns
+ name = "Summon Sentient Clown"
+ desc = "Take a clown out of this staff to help you fight, and reclaim the clown motherland."
+ icon_icon = 'icons/mob/actions/actions_items.dmi'
+ button_icon_state = "clown"
+ // stores the clowns created by the action
+ var/list/clowns_created = list()
+ // max clowns available at a time
+ var/max_clowns = 5
+ // cooldown time for clowns
+ var/cooldown_time = 0
+ // cooldown time added for clown spawning in deciseconds
+ var/cooldown_time_added = 150
+ // possible mobs to be spawned from the staff, weighted list, higher number means more chance to be picked
+ var/list/possible_mobs = list(/mob/living/simple_animal/hostile/retaliate/clown/clownhulk=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/longface=3,
+ /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/chlown=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob=3,
+ /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/destroyer=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/fleshclown=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/honcmunculus=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/mutant=2)
+
+/datum/action/item_action/summon_clowns/IsAvailable()
+ // get rid of clowns that don't exist anymore
+ for(var/mob/living/SM in clowns_created)
+ if(!SM || SM.stat == DEAD)
+ clowns_created -= SM
+ return (cooldown_time <= world.time) && (clowns_created.len < max_clowns) && ..()
+
+/datum/action/item_action/summon_clowns/Trigger()
+ if(..())
+ // people are going to try and use it as often as possible anyways, might as well just apply the full cooldown whether it works or not
+ cooldown_time = world.time + cooldown_time_added
+ UpdateButtonIcon()
+ to_chat(owner, "You reach into the staff to pull out a clown...")
+ var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a summoned clown?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, POLL_IGNORE_CLOWN_STAFF_SUMMON) //players must answer rapidly // see poll_ignore.dm
+ if(LAZYLEN(candidates))
+ var/mob/dead/observer/C = pick(candidates)
+ var/picked_type = pickweight(possible_mobs)
+ var/mob/living/simple_animal/SM = new picked_type(owner.loc)
+ SM.loot = list(/obj/effect/gibspawner/human)
+ SM.key = C.key
+ clowns_created += SM
+ to_chat(SM, "You are grateful to be chosen to reclaim the clown motherland! Serve and assist [owner.real_name] and the station in defeating the infection as your first task!")
+ to_chat(owner, "And you pull [SM] out of the staff! It worked!")
+ else
+ to_chat(owner, "You can't find a clown in the staff!")
+ sleep(cooldown_time_added)
+ UpdateButtonIcon()
+
+/obj/item/infectionkiller/tonic
+ name = "Spinel Tonic"
+ desc = "An ancient recreational substance, when imbibed it boosts the drinker's physical capabilities to near godhood. Gives stunproofing, speed, and a strong unarmed attack."
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = "atomicbombglass"
+ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+ color = "#000080"
+
+/obj/item/infectionkiller/tonic/attack(mob/living/M, mob/user)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ to_chat(H, "YOU FEEL LIKE A GOD.")
+ H.AddComponent(/datum/component/superpowers, -1, FALSE, FALSE, /obj/item/infectionkiller/tonicfists, /obj/item/infectionkiller/tonic)
+ qdel(src, force=TRUE)
+ return
+ . = ..()
+
+/obj/item/infectionkiller/tonicfists
+ name = "Tonic Powered Fists"
+ desc = "H-He's fast!"
+ icon = 'icons/effects/blood.dmi'
+ icon_state = "bloodhand_left"
+ force = 30
+ color = "#000080"
+ is_item = FALSE
+
+/obj/item/infectionkiller/tonicfists/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ user.changeNext_move(CLICK_CD_MELEE * 0.25)
diff --git a/code/modules/antagonists/infection/pylons.dm b/code/modules/antagonists/infection/pylons.dm
new file mode 100644
index 000000000000..f701d2559be1
--- /dev/null
+++ b/code/modules/antagonists/infection/pylons.dm
@@ -0,0 +1,98 @@
+#define PYLON_RANGE 4
+
+/obj/item/pylon_spawner
+ name = "deployable pylon"
+ desc = "A compact pylon, use it in hand to prepare it for use."
+ icon = 'icons/mob/infection/infection.dmi'
+ icon_state = "dpylon"
+ var/contained_pylon = /obj/structure/destructible/infection_pylon
+
+/obj/item/pylon_spawner/attack_self(mob/user)
+ to_chat(user, span_notice("You activate [src], and the pylon expands!"))
+ new contained_pylon(get_turf(src))
+ qdel(src)
+
+/obj/item/pylon_spawner/charger
+ name = "deployable charger pylon"
+ contained_pylon = /obj/structure/destructible/infection_pylon/charger
+
+/obj/item/pylon_spawner/turret
+ name = "deployable disruptor pylon"
+ contained_pylon = /obj/structure/destructible/infection_pylon/turret
+
+/obj/structure/destructible/infection_pylon
+ name = "generic pylon"
+ desc = "it does stuff"
+ anchored = FALSE
+ icon = 'icons/mob/infection/infection.dmi'
+ icon_state = "pylon"
+ var/unanchored_icon = "pylon" //icon for when this structure is unanchored
+
+/obj/structure/destructible/infection_pylon/Initialize()
+ . = ..()
+ START_PROCESSING(SSprocessing, src)
+ update_anchored()
+
+/obj/structure/destructible/infection_pylon/Destroy()
+ STOP_PROCESSING(SSprocessing, src)
+ return ..()
+
+/obj/structure/destructible/infection_pylon/attackby(obj/item/I, mob/user, params)
+ var/success = default_unfasten_wrench(user, I, 8 SECONDS)
+ if(success == SUCCESSFUL_UNFASTEN)
+ update_anchored(user)
+ return TRUE
+ if(success == FAILED_UNFASTEN)
+ return TRUE
+ return ..()
+
+/obj/structure/destructible/infection_pylon/can_be_unfasten_wrench(mob/user, silent)
+ if(!anchored)
+ for(var/obj/structure/destructible/infection_pylon/P in orange(PYLON_RANGE, src))
+ if(P.anchored)
+ if(!silent)
+ to_chat(user, span_warning("A safety light flashes on the side of [src], placing two of these this close would prevent either from drawing their power."))
+ return FAILED_UNFASTEN
+ return SUCCESSFUL_UNFASTEN
+
+/obj/structure/destructible/infection_pylon/proc/update_anchored()
+ if(anchored)
+ icon_state = initial(icon_state)
+ else
+ icon_state = unanchored_icon
+
+/obj/structure/destructible/infection_pylon/charger
+ name = "node pylon"
+ desc = "A pylon that draws power directly from bluespace and distributes it to nearby weaponry."
+ icon_state = "powerpylon"
+
+/obj/structure/destructible/infection_pylon/charger/process()
+ if(!anchored)
+ return
+ for(var/atom/movable/AM in range(PYLON_RANGE/2, src)) //halved range for "balance" and to prevent stacking
+ for(var/obj/item/stock_parts/cell/C in AM.GetAllContents())
+ var/newcharge = min(C.charge+0.05*C.maxcharge, C.maxcharge) //5% per process, about the same amount as a leveled cell charger
+ if(C.charge < newcharge)
+ C.charge = newcharge
+ if(isobj(C.loc))
+ var/obj/O = C.loc
+ O.update_icon() //update power meters and such
+ Beam(AM, icon_state = "medbeam", time = 2 SECONDS)
+ C.update_icon()
+
+/obj/structure/destructible/infection_pylon/turret
+ name = "disruptor pylon"
+ desc = "A pylon that charges the nearby area with a weak bluespace field, tearing apart nearby infected creep."
+ icon_state = "defensepylon"
+ var/list/effected_types = list(/obj/structure/infection/normal, /obj/structure/infection/shield)
+
+/obj/structure/destructible/infection_pylon/turret/process()
+ if(!anchored)
+ return
+ var/damage_successful = FALSE
+ for(var/obj/structure/infection/I in view(PYLON_RANGE, src)) //works off view to make it harder to block off with walls
+ if(is_type_in_list(I, effected_types))
+ I.take_damage(15, BURN)
+ damage_successful = TRUE
+ if(damage_successful)
+ flick("defensepylonattack", src)
diff --git a/code/modules/antagonists/infection/tech_nodes.dm b/code/modules/antagonists/infection/tech_nodes.dm
new file mode 100644
index 000000000000..4273d5a681c0
--- /dev/null
+++ b/code/modules/antagonists/infection/tech_nodes.dm
@@ -0,0 +1,43 @@
+//infra, 5x5 passive buff structures for the crew, have ocular warden esque anti-overlap and can't be placed behind the current combat zone
+// energy pylons that recharge guns in their range
+// turret pylons that passively damages nearby infection
+//
+
+//bio, gives buffs to crew health sustainability with new or improved medical equipment
+// sleeper upgrade that makes sleepers heal 6 points instead of 2
+// syringe gun that fires pre-loaded piercing syringes of reskinned syndicate nanites, cooldown per shot is both global per person and per gun
+//
+
+GLOBAL_LIST_EMPTY(infection_techs)
+
+/datum/techweb_node/infection //infra 1 (also used for the base techweb node so there isnt one sitting around awkwardly)
+ id = "infection_base"
+ display_name = "Infected Crystalline Research (Charging Pylon)"
+ description = "Basic research into infected crystalline structures, specifically the energy distributing behavior of node crystals."
+ research_costs = list(TECHWEB_POINT_TYPE_INFECTION = 2500)
+ design_ids = list("infection_charger")
+ hidden = TRUE
+
+/datum/techweb_node/infection/New()
+ ..()
+ GLOB.infection_techs += id
+
+/datum/techweb_node/infection/turret //infra 2
+ id = "infection_turret"
+ display_name = "Infected Crystalline Research (Disruptor Turret)"
+ description = "Advanced research into infested crystalline structures, creating an experimental disruptor 'turret' which destroys nearby creep."
+ prereq_ids = list("infection_base")
+ design_ids = list("infection_turret")
+
+/datum/techweb_node/infection/sleeper //bio 1
+ id = "infection_sleeper"
+ display_name = "Infected Biomass Research (Sleeper Enhancement)"
+ description = "Basic research into infected creep and its replication. Advances here will have applications with conventional medical technology."
+ design_ids = list("infection_sleeper_upgrade")
+
+/datum/techweb_node/infection/portableheal //bio 2
+ id = "infection_injector"
+ display_name = "Infected Biomass Research (Compact Medical Apparatus)"
+ description = "Advanced research into infected creep, exploiting the replicating nature of infected biomass to create a fast acting medical apparatus."
+ prereq_ids = list("infection_sleeper")
+ design_ids = list("infection_injector")
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 6ca675f7f059..5da10adf0a27 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1730,6 +1730,12 @@
cost = 2000
contains = list(/obj/item/gun/energy/plasmacutter/adv)
+/datum/supply_pack/clearance/targettingcomputer
+ name = "Laser Rifle Targetting Upgrade Crate"
+ desc = "A 9-pack upgrade kit of 'smartfire' targetting computers for standard issue NT laser rifles. Applying one of these to a laser will allow it to fire around friendlies."
+ cost = 800
+ contains = list(/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer,/obj/item/targettingcomputer)
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index 27a7a21b126f..a270579b5165 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -19,7 +19,8 @@
var/holidayID = "" //string which should be in the SSeventss.holidays list if you wish this event to be holiday-specific
//anything with a (non-null) holidayID which does not match holiday, cannot run.
- var/wizardevent = FALSE
+ var/wizardevent = FALSE //caused by wizards
+ var/infectionevent = FALSE //caused by infection gamemode
var/random = FALSE //If the event has occured randomly, or if it was forced by an admin or in-game occurance
var/alert_observers = TRUE //should we let the ghosts and admins know this event is firing
//should be disabled on events that fire a lot
@@ -36,7 +37,7 @@
var/dynamic_should_hijack = FALSE
/datum/round_event_control/New()
- if(config && !wizardevent) // Magic is unaffected by configs
+ if(config && !wizardevent && !infectionevent) // Magic is unaffected by configs
earliest_start = CEILING(earliest_start * CONFIG_GET(number/events_min_time_mul), 1)
min_players = CEILING(min_players * CONFIG_GET(number/events_min_players_mul), 1)
@@ -52,6 +53,8 @@
return FALSE
if(wizardevent != SSevents.wizardmode)
return FALSE
+ if(infectionevent != SSevents.infectionmode)
+ return FALSE
if(players_amt < min_players)
return FALSE
if(gamemode_blacklist.len && (gamemode in gamemode_blacklist))
diff --git a/code/modules/events/infection/events.dm b/code/modules/events/infection/events.dm
new file mode 100644
index 000000000000..6676ffd246c3
--- /dev/null
+++ b/code/modules/events/infection/events.dm
@@ -0,0 +1,170 @@
+GLOBAL_LIST_EMPTY(doom_event_mobs)
+
+/datum/round_event_control/infection
+ name = "Doom Clock Event"
+ weight = 1
+ max_occurrences = 1
+ earliest_start = 0 MINUTES
+ infectionevent = TRUE
+
+/datum/round_event_control/infection/preRunEvent()
+ // ok time to go old event mobs you had your fun
+ for(var/mob/living/oldmob in GLOB.doom_event_mobs)
+ GLOB.doom_event_mobs -= oldmob
+ if(ismob(oldmob) && oldmob.stat != DEAD)
+ oldmob.visible_message("[oldmob] fades away as all of it's energy leaves it's body...",
+ "Your consciousness fades away as the last remnants of the energy that brought you back into this world dissipate...")
+ oldmob.health = 0 // need to snowflake this for mobs like megafauna that refuse to die
+ oldmob.death()
+ var/doom_delay = 300 // 30 seconds
+ INVOKE_ASYNC(src, .proc/doom_smash_sounds, doom_delay)
+ sleep(doom_delay - 90)
+ . = ..()
+
+/*
+ Plays sounds to playing players before the event actually occurs
+*/
+
+/datum/round_event_control/infection/proc/doom_smash_sounds(var/total_delay = 300)
+ var/sound_delay = 14
+ var/sounds_played = FLOOR(total_delay / sound_delay, 1)
+ var/list/smashsounds = list('sound/weapons/wpnMonsterSmashBig.ogg', 'sound/weapons/wpnMonsterSmashBig2.ogg', 'sound/weapons/wpnMonsterSmashBig3.ogg')
+ var/list/tempsounds = smashsounds.Copy()
+ for(var/i = 1 to sounds_played)
+ if(!tempsounds.len)
+ tempsounds = smashsounds.Copy()
+ var/s = sound(pick_n_take(tempsounds))
+ sound_to_playing_players(s)
+ sleep(sound_delay)
+
+/datum/round_event/infection
+ // boss mob type, only one slime spawns as this, and they also drop the legendary weapon from boss_drop_list
+ var/boss_type
+ // overrides boss loot list, should always have at least one infectionkiller weapon, or the gamemode is obviously impossible to win
+ var/list/boss_drop_list
+ // list of minion types that can be a weighted list, picks from these to spawn in slime controlled mobs that are not the boss
+ var/list/minion_types
+ // overrides minion drop lists if you want to do something special
+ var/list/minion_drop_list
+ // announcement message sent to the whole station when the event occurs
+ var/warning_message
+ // sound that is sent when the event occurs
+ var/warning_jingle
+ fakeable = FALSE
+
+/datum/round_event/infection/start()
+ var/mob/camera/commander/C = GLOB.infection_commander
+ var/turf/start = get_turf(GLOB.infection_core)
+ // one lucky nerd
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/boss_spore
+ if(boss_type)
+ var/list/possible_boss = C.infection_mobs.Copy()
+ boss_spore = null
+ for(var/i in 1 to possible_boss.len)
+ var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/S = pick_n_take(possible_boss)
+ if(S.client)
+ boss_spore = S
+ break
+ if(!boss_spore)
+ message_admins("Error! Failed to get slime for infection event.")
+ // spawn a random legendary weapon so the game isn't unbeatable
+ var/list/legendaries = subtypesof(/obj/item/infectionkiller)
+ for(var/i in 1 to legendaries.len)
+ var/spawn_type = pick_n_take(legendaries)
+ // don't bother specifying a position, they're stationloving so they'll come back anyways
+ var/obj/item/infectionkiller/W = new spawn_type()
+ // whoops it's not stationloving get rid of it
+ if(!W.is_item)
+ qdel(W)
+ continue
+ break
+ return FALSE
+ boss_spore.death()
+ var/mob/living/simple_animal/boss = new boss_type(start)
+ boss.add_atom_colour(C.color, FIXED_COLOUR_PRIORITY)
+ boss.AddComponent(/datum/component/mindcontroller, boss_spore, list(ROLE_INFECTION))
+ boss.AddComponent(/datum/component/no_beacon_crossing)
+ boss.loot = boss_drop_list
+ boss.pass_flags |= PASSBLOB
+ GLOB.doom_event_mobs += boss
+ // everyone else gets minions
+ if(minion_types.len)
+ for(var/mob/living/simple_animal/hostile/infection/infectionspore/sentient/spore in (C.infection_mobs - boss_spore))
+ if(!spore.client)
+ continue
+ spore.death()
+ var/minion_type = pickweight(minion_types)
+ var/mob/living/simple_animal/minion = new minion_type(start)
+ minion.add_atom_colour(C.color, FIXED_COLOUR_PRIORITY)
+ minion.AddComponent(/datum/component/mindcontroller, spore, list(ROLE_INFECTION))
+ minion.AddComponent(/datum/component/no_beacon_crossing)
+ minion.loot = minion_drop_list
+ minion.pass_flags |= PASSBLOB
+ if(istype(minion, /mob/living/simple_animal/hostile/asteroid))
+ minion.damage_coeff[BURN] = 3 //asteroid mobs take 1/3 damage from lasers and generally have high health
+ GLOB.doom_event_mobs += minion
+ if(warning_message && warning_jingle)
+ priority_announce("[warning_message]","CentCom Biohazard Division", warning_jingle)
+
+/*
+//
+// Actual Events
+//
+*/
+
+/datum/round_event_control/infection/space
+ name = "Doom Event: Space Creatures"
+ typepath = /datum/round_event/infection/space
+
+/datum/round_event/infection/space
+ boss_type = /mob/living/simple_animal/hostile/megafauna/dragon/space_dragon
+ boss_drop_list = list(/obj/item/infectionkiller/excaliju)
+ minion_types = list(/mob/living/simple_animal/hostile/hivebot/strong=1,
+ /mob/living/simple_animal/hostile/skeleton=2,
+ /mob/living/simple_animal/hostile/hivebot/range=3)
+ minion_drop_list = list()
+ warning_message = "A space dragon and other space creatures have wandered into the station!"
+ warning_jingle = 'sound/weapons/bite.ogg'
+
+/datum/round_event_control/infection/lavaland
+ name = "Doom Event: Monsters From Lavaland"
+ typepath = /datum/round_event/infection/lavaland
+
+/datum/round_event/infection/lavaland
+ boss_type = /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
+ boss_drop_list = list(/obj/item/infectionkiller/drill)
+ minion_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher=1,
+ /mob/living/simple_animal/hostile/skeleton/plasmaminer=3,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion=1)
+ minion_drop_list = list()
+ warning_message = "Lavaland monsters appear to be attacking the station!"
+ warning_jingle = 'sound/magic/enter_blood.ogg'
+
+/datum/round_event_control/infection/clown
+ name = "Doom Event: Clowns"
+ typepath = /datum/round_event/infection/clown
+
+/datum/round_event/infection/clown
+ boss_type = /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/destroyer
+ boss_drop_list = list(/obj/item/infectionkiller/staff)
+ minion_types = list(/mob/living/simple_animal/hostile/retaliate/clown/clownhulk=1,
+ /mob/living/simple_animal/hostile/retaliate/clown/mutant=1,
+ /mob/living/simple_animal/hostile/retaliate/clown/lube=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/fleshclown=2,
+ /mob/living/simple_animal/hostile/retaliate/clown/banana=2)
+ minion_drop_list = list()
+ warning_message = "Clowns... oh god the clowns..."
+ warning_jingle = 'sound/items/bikehorn.ogg'
+
+/datum/round_event_control/infection/jungle
+ name = "Doom Event: Jungle Madness"
+ typepath = /datum/round_event/infection/jungle
+
+/datum/round_event/infection/jungle
+ boss_type = /mob/living/simple_animal/hostile/jungle/mega_arachnid
+ boss_drop_list = list(/obj/item/infectionkiller/tonic)
+ minion_types = list(/mob/living/simple_animal/hostile/asteroid/wasp=2,
+ /mob/living/simple_animal/hostile/jungle/seedling=1)
+ minion_drop_list = list()
+ warning_message = "Jungle Creatures are invading the station!"
+ warning_jingle = 'sound/creatures/gorilla.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 995ef07d5a5c..b8bd21597d76 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -335,7 +335,8 @@
/mob/living/simple_animal/hostile/proc/AttackingTarget()
- SEND_SIGNAL(src, COMSIG_HOSTILE_ATTACKINGTARGET, target)
+ if(SEND_SIGNAL(src, COMSIG_HOSTILE_ATTACKINGTARGET, target) & COMPONENT_HOSTILE_NO_ATTACK)
+ return FALSE
in_melee = TRUE
return target.attack_animal(src)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9eac34b701b9..56b2abbc7199 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -446,7 +446,7 @@
client.recent_examines[A] = world.time + EXAMINE_MORE_TIME
result = A.examine(src)
addtimer(CALLBACK(src, .proc/clear_from_recent_examines, A), EXAMINE_MORE_TIME)
-
+
else
result = A.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist?
to_chat(src, result.Join("\n"))
@@ -699,6 +699,7 @@
*
* * Unset machines if "mach_close" sent
* * refresh the inventory of machines in range if "refresh" sent
+ * * moves the mob to a referenced target
* * handles the strip panel equip and unequip as well if "item" sent
*/
/mob/Topic(href, href_list)
@@ -711,6 +712,10 @@
if(machine && in_range(src, usr))
show_inv(machine)
+ if(href_list["walk_to"])
+ var/target = locate(href_list["walk_to"])
+ if(target && isatom(target))
+ walk_to(src, target, 0, movement_delay())
if(href_list["item"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
var/slot = text2num(href_list["item"])
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 0d42bc2d45c8..f5a67e3bae25 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -315,7 +315,7 @@
var/mob/M = AM
if(M.buckled)
continue
- if(!AM.CanPass(src) || AM.density)
+ if(!AM.CanPass(src) || AM.density || AM.spacemove_backup)
if(AM.anchored)
return AM
if(pulling == AM)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 34ff5003ede3..e984efb98a05 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -24,6 +24,17 @@
wound_bonus = -30
bare_wound_bonus = 40
+/obj/item/projectile/beam/laser/passfriendlies
+ name = "targetted laser"
+
+/obj/item/projectile/beam/laser/passfriendlies/can_hit_target(atom/target, list/passthrough, direct_target = FALSE, ignore_loc = FALSE)
+ if(ismob(target) && ismob(firer))
+ var/mob/M = target
+ var/mob/F = firer
+ if(!(target == original) && faction_check(M.faction,F.faction))
+ return
+ . = ..()
+
//overclocked laser, does a bit more damage but has much higher wound power (-0 vs -20)
/obj/item/projectile/beam/laser/hellfire
name = "hellfire laser"
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 2c4439127436..a62d5b1332f9 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -142,7 +142,8 @@ Note: Must be placed within 3 tiles of the R&D Console
var/loaded_type = loaded_item.type
if(destroy_item(loaded_item))
linked_console.stored_research.add_point_list(point_value)
- linked_console.stored_research.deconstructed_items[loaded_type] = point_value
+ if(!(loaded_type in SSresearch.techweb_repeatable_items))
+ linked_console.stored_research.deconstructed_items[loaded_type] = point_value
return TRUE
/obj/machinery/rnd/destructive_analyzer/proc/unload_item()
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 0c1a0ce2515b..3e150939f9f0 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -252,6 +252,8 @@
for (var/id in node.prereq_ids)
var/prereq_tier = tiers[id]
tier = max(tier, prereq_tier + 1)
+ if(!tier) //fallback if we don't have any prereqs
+ tier++
if (tier != tiers[node.id])
tiers[node.id] = tier
diff --git a/code/modules/research/techweb/layout.dm b/code/modules/research/techweb/layout.dm
index 271c930a421d..ca09d6d7e4c7 100644
--- a/code/modules/research/techweb/layout.dm
+++ b/code/modules/research/techweb/layout.dm
@@ -526,3 +526,19 @@
/datum/techweb_node/mech_xray
ui_x = -640
ui_y = -896
+
+/datum/techweb_node/infection/turret
+ ui_x = 32
+ ui_y = -32
+
+/datum/techweb_node/infection/sleeper
+ ui_x = -32
+ ui_y = 32
+
+/datum/techweb_node/infection/portableheal
+ ui_x = 32
+ ui_y = 32
+
+/datum/techweb_node/infection
+ ui_x = -32
+ ui_y = -32
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 1a3d0b762527..6968e7a35913 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi
index 1a7617d3bb43..9d212e05085f 100644
Binary files a/icons/effects/landmarks_static.dmi and b/icons/effects/landmarks_static.dmi differ
diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi
index 83e30b8dd7cb..2479193b3453 100644
Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ
diff --git a/icons/mob/infection/action_icons.dmi b/icons/mob/infection/action_icons.dmi
new file mode 100644
index 000000000000..a2409cf4584c
Binary files /dev/null and b/icons/mob/infection/action_icons.dmi differ
diff --git a/icons/mob/infection/crystal_effect.dmi b/icons/mob/infection/crystal_effect.dmi
new file mode 100644
index 000000000000..7adf2387e0dc
Binary files /dev/null and b/icons/mob/infection/crystal_effect.dmi differ
diff --git a/icons/mob/infection/crystaline_infection_large.dmi b/icons/mob/infection/crystaline_infection_large.dmi
new file mode 100644
index 000000000000..0d76768d20fa
Binary files /dev/null and b/icons/mob/infection/crystaline_infection_large.dmi differ
diff --git a/icons/mob/infection/crystaline_infection_medium.dmi b/icons/mob/infection/crystaline_infection_medium.dmi
new file mode 100644
index 000000000000..13db4d0f95d4
Binary files /dev/null and b/icons/mob/infection/crystaline_infection_medium.dmi differ
diff --git a/icons/mob/infection/infection.dmi b/icons/mob/infection/infection.dmi
new file mode 100644
index 000000000000..bd2c6e470f51
Binary files /dev/null and b/icons/mob/infection/infection.dmi differ
diff --git a/icons/mob/infection/legendary_weapons.dmi b/icons/mob/infection/legendary_weapons.dmi
new file mode 100644
index 000000000000..1f81d1b07fc9
Binary files /dev/null and b/icons/mob/infection/legendary_weapons.dmi differ
diff --git a/icons/mob/infection/slime_mob.dmi b/icons/mob/infection/slime_mob.dmi
new file mode 100644
index 000000000000..8e83900e41bd
Binary files /dev/null and b/icons/mob/infection/slime_mob.dmi differ
diff --git a/icons/mob/inhands/equipment/mining_lefthand.dmi b/icons/mob/inhands/equipment/mining_lefthand.dmi
index e902690c37f3..5b392fb98fef 100644
Binary files a/icons/mob/inhands/equipment/mining_lefthand.dmi and b/icons/mob/inhands/equipment/mining_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/mining_righthand.dmi b/icons/mob/inhands/equipment/mining_righthand.dmi
index dacf9be07819..5c6217a86b5b 100644
Binary files a/icons/mob/inhands/equipment/mining_righthand.dmi and b/icons/mob/inhands/equipment/mining_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index cbc41eb6ab57..174d72d32e42 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index e4e6d1db1081..d8778e959454 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/mob/screen_full.dmi b/icons/mob/screen_full.dmi
index 274a96cd065a..b6f108c2ffa6 100644
Binary files a/icons/mob/screen_full.dmi and b/icons/mob/screen_full.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 6e57981c9197..51dfe41c9fa7 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/smooth_structures/infection_wall.dmi b/icons/obj/smooth_structures/infection_wall.dmi
new file mode 100644
index 000000000000..870c490410c3
Binary files /dev/null and b/icons/obj/smooth_structures/infection_wall.dmi differ
diff --git a/sound/ambience/doomevent4.ogg b/sound/ambience/doomevent4.ogg
new file mode 100644
index 000000000000..63b8cb38061e
Binary files /dev/null and b/sound/ambience/doomevent4.ogg differ
diff --git a/sound/effects/crystal_fire.ogg b/sound/effects/crystal_fire.ogg
new file mode 100644
index 000000000000..254894f2ab5c
Binary files /dev/null and b/sound/effects/crystal_fire.ogg differ
diff --git a/sound/effects/crystal_turret_hitsound.ogg b/sound/effects/crystal_turret_hitsound.ogg
new file mode 100644
index 000000000000..68cebd4e2999
Binary files /dev/null and b/sound/effects/crystal_turret_hitsound.ogg differ
diff --git a/sound/effects/hitscan_zap.ogg b/sound/effects/hitscan_zap.ogg
new file mode 100644
index 000000000000..90f2bf8a0d72
Binary files /dev/null and b/sound/effects/hitscan_zap.ogg differ
diff --git a/sound/weapons/wpnHit1.ogg b/sound/weapons/wpnHit1.ogg
new file mode 100644
index 000000000000..00852e65d5b4
Binary files /dev/null and b/sound/weapons/wpnHit1.ogg differ
diff --git a/sound/weapons/wpnHit2.ogg b/sound/weapons/wpnHit2.ogg
new file mode 100644
index 000000000000..d554b18c7a34
Binary files /dev/null and b/sound/weapons/wpnHit2.ogg differ
diff --git a/sound/weapons/wpnMonsterSmashBig.ogg b/sound/weapons/wpnMonsterSmashBig.ogg
new file mode 100644
index 000000000000..918e26b0dd7e
Binary files /dev/null and b/sound/weapons/wpnMonsterSmashBig.ogg differ
diff --git a/sound/weapons/wpnMonsterSmashBig2.ogg b/sound/weapons/wpnMonsterSmashBig2.ogg
new file mode 100644
index 000000000000..b097354d00e8
Binary files /dev/null and b/sound/weapons/wpnMonsterSmashBig2.ogg differ
diff --git a/sound/weapons/wpnMonsterSmashBig3.ogg b/sound/weapons/wpnMonsterSmashBig3.ogg
new file mode 100644
index 000000000000..ac1e0064a8e3
Binary files /dev/null and b/sound/weapons/wpnMonsterSmashBig3.ogg differ
diff --git a/sound/weapons/wpnProc.ogg b/sound/weapons/wpnProc.ogg
new file mode 100644
index 000000000000..d3fdc0a5c069
Binary files /dev/null and b/sound/weapons/wpnProc.ogg differ
diff --git a/tgui/packages/tgui/interfaces/infection_menu.js b/tgui/packages/tgui/interfaces/infection_menu.js
new file mode 100644
index 000000000000..ddc8cdde6122
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/infection_menu.js
@@ -0,0 +1,52 @@
+import { useBackend } from '../backend';
+import { Box, Button, Section } from '../components';
+import { Window } from '../layouts';
+
+export const infection_menu = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const {
+ evolution_points,
+ } = data;
+
+ const upgrade_list = data.upgrades;
+ return (
+ [RDSCREEN_NOBREAK]"
for (var/node_ in stored_research.tiers)
var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_)
+ if(node.id in stored_research.hidden_nodes)
+ continue
var/class = ""
if(stored_research.researched_nodes[node_])
class = ""
@@ -145,4 +147,4 @@
for (var/node_ in stored_research.tiers)
var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_)
text += "[node.type]\n\tui_x = [node.ui_x]\n\tui_y = [node.ui_y]\n\n"
- return text
+ return text