Mindflayers v0.9, Playable Edition! (#26596)

* adds antaghud icon * TGUI bundle build dont push changes i didnt stage challenge 2025 (IMPOSSIBLE) * Adds organ repair passive * Description fix * Runs prettier * Fixes desc 2 * Fix revert * Remove vamp text * Fix some CI + Partial refactor * Fixes CI * Fixes gamemodes I messed with * Moves these procs over * Description fix again * Add back limit requiring drainees to have ckeys * Adds terminator icon * Update code/datums/status_effects/buffs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/surgery/organs/augments_internal.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * More lewv review * Clamps the EMP severity * Fixes "surveilance" typos * The TODO is gone and can't hurt me anymore * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/game/objects/items/weapons/pneumaticCannon.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/game/objects/items/weapons/stunbaton.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * More lewc reviews * Update code/modules/antagonists/_common/antag_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/_common/antag_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Fixes some camera bug issues + lewc reviews * Update code/modules/antagonists/mind_flayer/powers/flayer_passives.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Updates a comment and fixes whitespace * Autodocs flayerprod * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * qdel things we dont need anymore + typing an argument of add_abillity * Remove debug log * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Slightly buffs, and fixes GC issues of tether * I no longer feel i am a mindflayer * Fixes formatting of greeting * Better greeting * Worlds shittiest sprite * Don't need this TODO anymore * Fixes double description * Changes the wording on the borg laws * and bundle too * The cannon uses shrapnel now * Initial style changes * Ratios for brain damage * Adds a chemical to test for flayerism * Fixes the brain damage ratios * Abilities are purchasable again * Updates TGUI properly * im sorry linter * Steam smoke * Hi bundle * Re-abstracts this proc post syndi orgs * Fixes gamemode logic post cling round removal * I WONT FORGET IT THIS TIME * Fix name of steam ability * I'm a fool * Fixes processed passives + removes debug message * Fixes updating abilities inside UI * Better description for quicksilver form * First part lewc review * Remove debug thingy * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Fixes defines + GCs weapon spells * We don't need this * Eyes GC properly * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * adds better logging to the assimilate * Adds parenthesis Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * TGUI Bundle Rebuild * Fixes and Reworks TGUI * Cleaner JS and Fixes * adds anti-snitching clause to borg laws * changes the span for the borg messages * No holoparasites * Puts baton silence in line with glare * Fixes total_swarms_gathered * Nuke old trait * Gun no longer not stuck * Rejuv clears delayed knockdown * Some weapon ability fixes * Makes radio enable timers not counterintuitive * Fixes beepsky runtimes * Makes naming more consistent * Adds one-click-antag * Adds the mind flayer toggle (doesn't technically work) * Adds flayers to check_antagonist * Gives IDs to the status effects * Also this one * Makes retracting work again if it's in your offhand * Fixes pacification tech levels * Grapple is a weapon ability now, nullifcation retracts implants * Fixed descriptions * Adds some pizzaz to torque enhancer * This actually needs to be like this * Moves a helper proc over to a helper proc file * Extra admin visibility * Nukes the wacky flayer mob * Makes silicon administrative access more sane * Terminator form better description * Makes rejuv set stamina to 0 * Various price increases * AAAAAAAAAAAAA * Better feedback + logging on cyborg subversion * Swarm purchase display (temp fix) * Makes mindflayer sounds more silent * UI improvements * Various mindflayer fixes * Typo * More fixes * Fixes innates from being stupid * Forgot to add this check earlier * Oh this is how you add things to the protolathe * Changes some description and upgrade messages * Allows you to drain people beyond your limit * Fixes some weapon upgrade issues * Fix CI * Fixes some draining issues * More UI Tweaks and QoL * Fixes most of the issues * text * Fixes * Adds a radio jamming option to intruder * Gives obfusciation to jammer ability * Small passive cleanup * Fixes Search and Adds Ability Stages to UI * Adds freebie abilities * Restructuring chain and adding blackbox * Tgui polish * Small fix for traceroute * Fixes one click antag * Increases EMP resistance cost * Changes the pneumatic cannon into a shotgun * Slightly lower static * Fixed innate building rendering in upgrades * Fixes icon and description * Consistency * Punctuation fix. * Quick reboot + terminator form synergy * Adds safety deleting * Fix level for torque * Fixes a bad bug * Update code/game/gamemodes/objective.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Aaaaaaaaaaa * Makes torque a martial art and some martial arts safeties * Replaces vortex arm with barrier * Fix paths * Adds torque knockdown * Part 1 lewc review * HIIIII SQUIDWARD I'M IN YOUR BRANCH NOW * Removes flak cannon * Flayer respects mindshielding now on vamp+cling * Fixes EMP resist * More fixes * DGL review * Contra review * Clean up weapon powers * Various tweaks * Borg hand slight improvements * Parent call needs to be after this * Fixes stuff * Adds a new proc that is called when a spell is purchased * NEW SPRITES WOOOO * Traceroute update * Slightly lower traceroute cost * Formatting * Oops * Wow this could've been bad * Overclock small buff * Reduces cost of 1st level EMP immunity * Lewc review * TGUI Bundle Rebuild * Fix barricades * Lewc review * Okay FINE qwerty I'll change this * Traceroute thingy * I am an idiot * First part * Lewc review * Forgor this one * Last bits * Update code/game/objects/items/control_wand.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Null * Static-ness * Update code/game/gamemodes/changeling/traitor_chan.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/__DEFINES/mindflayer_defines.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Last bits --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: DGamerL <daan.lyklema@gmail.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
2026-07-19 02:54:41 +01:00 · 2024-10-30 14:35:29 -04:00
parent c4521dc955
commit 036b8e0182
100 changed files with 3063 additions and 193 deletions
@@ -134,6 +134,35 @@
 /datum/effect_system/smoke_spread/bad
 	effect_type = /obj/effect/particle_effect/smoke/bad

+/// Steam smoke
+/datum/effect_system/smoke_spread/steam
+	effect_type = /obj/effect/particle_effect/smoke/steam
+
+/obj/effect/particle_effect/smoke/steam
+	color = COLOR_OFF_WHITE
+	lifetime = 10 SECONDS_TO_LIFE_CYCLES
+	causes_coughing = TRUE
+
+/obj/effect/particle_effect/smoke/steam/Crossed(atom/movable/AM, oldloc)
+	. = ..()
+	if(!isliving(AM))
+		return
+	var/mob/living/crosser = AM
+	if(IS_MINDFLAYER(crosser))
+		return // Mindflayers are fully immune to steam
+	if(!ishuman(crosser))
+		crosser.adjustFireLoss(8)
+		return
+
+	var/mob/living/carbon/human/human_crosser = AM
+	var/fire_armour = human_crosser.get_thermal_protection()
+	if(fire_armour >= FIRE_SUIT_MAX_TEMP_PROTECT || HAS_TRAIT(human_crosser, TRAIT_RESISTHEAT))
+		return
+
+	crosser.adjustFireLoss(5)
+	if(prob(20))
+		to_chat(crosser, "<span class='warning'>You are being scalded by the hot steam!</span>")
+
 /////////////////////////////////////////////
 // Nanofrost smoke
 /////////////////////////////////////////////
@@ -181,10 +181,15 @@
 	item_state = "hacktool"
 	var/hack_speed = 1.5 SECONDS
 	var/busy = FALSE
+	/// How far can we use this. Leave `null` for infinite range
+	var/range

 /obj/item/door_remote/omni/access_tuner/afterattack(obj/machinery/door/D, mob/user)
 	if(!istype(D, /obj/machinery/door/airlock) && !istype(D, /obj/machinery/door/window))
 		return
+	if(!isnull(range) && get_dist(src, D) > range)
+		return
+
 	if(busy)
 		to_chat(user, "<span class='warning'>[src] is alreading interfacing with a door!</span>")
 		return
@@ -196,6 +201,11 @@
 	busy = FALSE
 	icon_state = "hacktool"

+/obj/item/door_remote/omni/access_tuner/flayer
+	name = "integrated access tuner"
+	hack_speed = 5 SECONDS
+	range = 10
+
 /// How long before you can "jangle" your keyring again (to prevent spam)
 #define JANGLE_COOLDOWN 10 SECONDS

@@ -42,7 +42,7 @@


 /obj/item/camera_bug/ert
-	name = "ERT Camera Monitor"
+	name = "\improper ERT Camera Monitor"
 	desc = "A small handheld device used by ERT commanders to view camera feeds remotely."

 /obj/item/camera_bug/ert/Initialize(mapload)
@@ -57,11 +57,16 @@
 	w_class = WEIGHT_CLASS_TINY
 	var/obj/machinery/camera/portable/camera_bug/camera
 	var/index = "REPORT THIS TO CODERS"
+	/// What name shows up on the camera bug list
+	var/camera_tag = "Hidden Camera"
+	/// If it sticks to whatever you throw at it
+	var/is_sticky = TRUE

 /obj/item/wall_bug/Initialize(mapload, obj/item/camera_bug/the_bug)
 	. = ..()
 	link_to_camera(the_bug)
-	AddComponent(/datum/component/sticky)
+	if(is_sticky)
+		AddComponent(/datum/component/sticky)
 	ADD_TRAIT(src, TRAIT_NO_THROWN_MESSAGE, ROUNDSTART_TRAIT)

 /obj/item/wall_bug/Destroy()
@@ -83,13 +88,32 @@

 	camera = new /obj/machinery/camera/portable/camera_bug(src)
 	camera.network = list("camera_bug[camera_bug.UID()]")
-	camera.c_tag = "Hidden Camera [index]"
+	camera.c_tag = "[camera_tag] [index]"
+
+/// Created by a mindflayer ability
+/obj/item/wall_bug/computer_bug
+	name = "nanobot"
+	desc = "A small droplet of a shimmering metallic slurry."
+	camera_tag = "Surveillance Unit"
+	is_sticky = FALSE
+	/// Reference to the creator's antag datum
+	var/datum/antagonist/mindflayer/flayer
+	COOLDOWN_DECLARE(alert_cooldown)
+
+/obj/item/wall_bug/computer_bug/Destroy()
+	flayer = null
+	return ..()
+
+/obj/item/wall_bug/computer_bug/link_to_camera(obj/item/camera_bug/camera_bug, datum/antagonist/mindflayer/flayer_datum)
+	..()
+	if(flayer_datum)
+		flayer = flayer_datum

 /obj/machinery/camera/portable/camera_bug
 	non_chunking_camera = TRUE

 /obj/item/paper/camera_bug
-	name = "Camera Bug Guide"
+	name = "\improper Camera Bug Guide"
 	icon_state = "paper"
 	info = {"<b>Instructions on your new invasive camera utility</b><br>
 	<br>
@@ -241,12 +241,13 @@ SLIME SCANNER
 		msgs += "<span class='warning'>Subject appears to have [H.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.</span>"

 	// Brain.
-	if(H.get_int_organ(/obj/item/organ/internal/brain))
-		if(H.getBrainLoss() >= 100)
+	var/obj/item/organ/internal/brain = H.get_int_organ(/obj/item/organ/internal/brain)
+	if(brain)
+		if(H.check_brain_threshold(BRAIN_DAMAGE_RATIO_CRITICAL)) // 100
 			msgs += "<span class='warning'>Subject is brain dead.</span>"
-		else if(H.getBrainLoss() >= 60)
+		else if(H.check_brain_threshold(BRAIN_DAMAGE_RATIO_MODERATE)) // 60
 			msgs += "<span class='warning'>Severe brain damage detected. Subject likely to have dementia.</span>"
-		else if(H.getBrainLoss() >= 10)
+		else if(H.check_brain_threshold(BRAIN_DAMAGE_RATIO_MINOR)) // 10
 			msgs += "<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span>"
 	else
 		msgs += "<span class='warning'>Subject has no brain.</span>"
@@ -46,7 +46,7 @@
 * Arguments:
 * * I - item to load into the cannon
 * * user - the person loading the item in
-* Returns:
+* * Returns:
 * * True if item was loaded, false if it failed
 */
 /obj/item/pneumatic_cannon/proc/load_item(obj/item/I, mob/user)
@@ -59,7 +59,6 @@
 	if(!user.unEquip(I) || I.flags & (ABSTRACT | NODROP | DROPDEL))
 		to_chat(user, "<span class='warning'>You can't put [I] into [src]!</span>")
 		return FALSE
-	to_chat(user, "<span class='notice'>You load [I] into [src].</span>")
 	loaded_items.Add(I)
 	loaded_weight_class += I.w_class
 	I.forceMove(src)
@@ -91,3 +91,15 @@
 	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
 	icon_prefix = "plasma"
 	welded_type = /obj/item/stack/sheet/plasmaglass
+
+/obj/item/shard/scrap
+	name = "sharpened scrap"
+	desc = "Some discarded scrap metal. It has sharp, jagged edges."
+	icon_state = "scrap"
+	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT)
+	welded_type = /obj/item/stack/sheet/metal
+	force = 9
+	throwforce = 15 //owie
+
+/obj/item/shard/scrap/set_initial_icon_state()
+	return
@@ -20,7 +20,7 @@
 	var/turned_on = FALSE
 	/// How much power does it cost to stun someone
 	var/hitcost = 1000
-	var/obj/item/stock_parts/cell/high/cell = null
+	var/obj/item/stock_parts/cell/cell = null // Adminbus tip: make this something that isn't a cell :)
 	/// the initial cooldown tracks the time between swings. tracks the world.time when the baton is usable again.
 	var/cooldown = 3.5 SECONDS
 	/// the time it takes before the target falls over
@@ -50,11 +50,16 @@
 /obj/item/melee/baton/proc/link_new_cell(unlink = FALSE)
 	if(unlink)
 		cell = null
-	else if(isrobot(loc.loc)) // First loc is the module
+		return
+	if(isrobot(loc?.loc)) // First loc is the module
 		var/mob/living/silicon/robot/R = loc.loc
 		cell = R.cell
+		return
+	if(!cell)
+		var/powercell = /obj/item/stock_parts/cell/high
+		cell = new powercell(src)
 	else
-		cell = new(src)
+		cell = new cell(src)

 /obj/item/melee/baton/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -207,6 +212,10 @@
 	if(HAS_TRAIT_FROM(L, TRAIT_WAS_BATONNED, user_UID)) // prevents double baton cheese.
 		return FALSE

+	if(hitcost > 0 && cell?.charge < hitcost)
+		to_chat(user, "<span class='warning'>[src] fizzles weakly as it makes contact. It needs more power!</span>")
+		return FALSE
+
 	cooldown = world.time + initial(cooldown) // tracks the world.time when hitting will be next available.
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
@@ -230,10 +239,13 @@
 		L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>",
 			"<span class='userdanger'>[L == user ? "You stun yourself" : "[user] has stunned you"] with [src]!</span>")
 		add_attack_logs(user, L, "stunned")
-	playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
+	play_hit_sound()
 	deductcharge(hitcost)
 	return TRUE

+/obj/item/melee/baton/proc/play_hit_sound()
+	playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
+
 /obj/item/melee/baton/proc/thrown_baton_stun(mob/living/carbon/human/L)
 	if(cooldown > world.time)
 		return FALSE
@@ -321,3 +333,69 @@
 	name = "electrically-charged arm"
 	desc = "A piece of scrap metal wired directly to your power cell."
 	hitcost = 100
+
+/obj/item/melee/baton/flayerprod
+	name = "stunprod"
+	desc = "A mechanical mass which you can use to incapacitate someone with."
+	icon_state = "swarmprod"
+	base_icon = "swarmprod"
+	item_state = "swarmprod"
+	force = 10
+	throwforce = 0 // Just in case
+	knockdown_duration = 6 SECONDS
+	knockdown_delay = 0 SECONDS
+	w_class = WEIGHT_CLASS_BULKY
+	flags = ABSTRACT | NODROP
+	turned_on = TRUE
+	cell = /obj/item/stock_parts/cell/flayerprod
+	/// The duration that stunning someone will disable their radio for
+	var/radio_disable_time = 8 SECONDS
+
+/obj/item/melee/baton/flayerprod/Initialize(mapload) // We are not making a flayerprod without a cell
+	link_new_cell()
+	return ..()
+
+/obj/item/melee/baton/flayerprod/update_icon_state()
+	return
+
+/obj/item/melee/baton/flayerprod/attackby(obj/item/I, mob/user, params)
+	return
+
+/obj/item/melee/baton/flayerprod/screwdriver_act(mob/living/user, obj/item/I)
+	return
+
+/obj/item/melee/baton/flayerprod/attack_self(mob/user)
+	return
+
+/obj/item/melee/baton/flayerprod/play_hit_sound()
+	playsound(src, 'sound/weapons/egloves.ogg', 25, TRUE, -1, ignore_walls = FALSE)
+
+/obj/item/melee/baton/flayerprod/baton_stun(mob/living/L, mob/user, skip_cooldown, ignore_shield_check = FALSE)
+	if(..())
+		disable_radio(L)
+		L.radio_enable_timer = addtimer(CALLBACK(src, PROC_REF(enable_radio), L), radio_disable_time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME)
+		return TRUE
+	return FALSE
+
+/obj/item/melee/baton/flayerprod/proc/disable_radio(mob/living/L)
+	var/list/all_items = L.GetAllContents()
+	for(var/obj/item/radio/R in all_items)
+		R.on = FALSE
+		R.listening = FALSE
+		R.broadcasting = FALSE
+		L.visible_message("<span class='warning'>[R] buzzes loudly as it short circuits!</span>", blind_message = "<span class='notice'>You hear a loud, electronic buzzing.</span>")
+
+/obj/item/melee/baton/flayerprod/proc/enable_radio(mob/living/L)
+	var/list/all_items = L.GetAllContents()
+	for(var/obj/item/radio/R in all_items)
+		R.on = TRUE
+		R.listening = TRUE
+
+/obj/item/melee/baton/flayerprod/deductcharge(amount)
+	if(cell.charge < hitcost)
+		return
+	cell.use(amount)
+
+/obj/item/melee/baton/flayerprod/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>This one seems to be able to interfere with radio headsets.</span>"