From 917ab9da7b42dc72aa6e187ccb66162b72581d98 Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:32:34 +0100
Subject: [PATCH 1/5] revision I
---
nsv13/code/__DEFINES/overmap.dm | 5 +
nsv13/code/datums/holocall.dm | 2 +-
nsv13/code/modules/overmap/pdsr.dm | 189 +++++++++++++-----
nsv13/code/modules/overmap/shieldgen.dm | 18 +-
nsv13/code/modules/overmap/weapons/damage.dm | 31 ++-
.../modules/overmap/weapons/projectiles_fx.dm | 9 +-
.../packages/tgui/interfaces/PDSRMainframe.js | 9 +-
.../tgui/interfaces/PDSRManipulator.js | 19 +-
8 files changed, 202 insertions(+), 80 deletions(-)
diff --git a/nsv13/code/__DEFINES/overmap.dm b/nsv13/code/__DEFINES/overmap.dm
index beb76f66c13..1b57a8fb64d 100644
--- a/nsv13/code/__DEFINES/overmap.dm
+++ b/nsv13/code/__DEFINES/overmap.dm
@@ -113,3 +113,8 @@ GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace
#define MASS_LARGE 7 //20-40 Players - Medium Capital Ships
#define MASS_TITAN 150 //40+ Players - Large Capital Ships
#define MASS_IMMOBILE 200 //Things that should not be moving. See: stations
+
+//Fun tools
+#define SHIELD_NOEFFECT 0 //!Shield failed to absorb hit.
+#define SHIELD_ABSORB 1 //!Shield absorbed hit.
+#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile.
diff --git a/nsv13/code/datums/holocall.dm b/nsv13/code/datums/holocall.dm
index 9f7b712eab5..59a064e2b80 100644
--- a/nsv13/code/datums/holocall.dm
+++ b/nsv13/code/datums/holocall.dm
@@ -320,7 +320,7 @@
DELAY 50
SAY If you need to shut down the reactor, lower the nucleium injection rate slowly. You can cycle coolant in an emergency for a quick cooling boost.
DELAY 50
- SAY The reaction can be terminated when the reactor core is under 100 Celsius. Ensure cooling is adequate to achieve this.
+ SAY The reaction can be terminated when the reactor core is under 200 Celsius. Ensure cooling is adequate to achieve this.
DELAY 50
SAY Finally. If your minimum input power ever starts to converge on the maximum, you are heading towards an emission. Rectify this immediately, or shut down the reactor safely.
DELAY 50
diff --git a/nsv13/code/modules/overmap/pdsr.dm b/nsv13/code/modules/overmap/pdsr.dm
index 36ee7c4b56f..ba687c41355 100644
--- a/nsv13/code/modules/overmap/pdsr.dm
+++ b/nsv13/code/modules/overmap/pdsr.dm
@@ -9,8 +9,11 @@
#define REACTOR_STATE_SHUTTING_DOWN 4
#define REACTOR_STATE_EMISSION 5
+#define DENSITY_LOW 0 //! Deflects only heavy hits.
+#define DENSITY_HIGH 1 //! Deflects all hits.
+
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor
- name = "mk I Prototype Defence Screen Reactor"
+ name = "mk II Prototype Defence Screen Reactor"
desc = "A highly experimental, unstable and highly illegal nucleium driven reactor for the generation of defensive screens."
icon = 'nsv13/icons/obj/machinery/pdsr.dmi'
icon_state = "idle"
@@ -46,9 +49,13 @@
var/last_coolant_time = 0 //Last time we called to flush coolant
var/flushing_coolant = 0 //Are we currently flushing coolant
var/emission_tracker = 0 //Used to track emission timers
+ ///Time when our reactor was last shutdown.
+ var/powerdown_time = 0
+ ///If this is already detonating
+ var/detonating = FALSE
//!Shield Vars
- var/list/shield = list("integrity" = 0, "max_integrity" = 0, "stability" = 0)
+ var/list/shield = list("integrity" = 0, "max_integrity" = 0, "stability" = 0, "density" = DENSITY_HIGH)
var/power_input = 0 //How much power is currently allocated
var/screen_regen = 50 //Allocation to regenerate the !shields
var/screen_hardening = 50 //Allocation to strengthen the !shields
@@ -124,7 +131,7 @@
return
current_uptime ++
- reaction_containment += 5
+ reaction_containment += 20 // ~5 seconds as opposed to 20 for core start.
if(reaction_containment >= 100)
reaction_containment = 100
if(reaction_injection_rate < 2.5)
@@ -145,6 +152,7 @@
say("Initiating Reaction - Injecting Nucleium.")
say("Reaction Initialized - [errors] runtimes supressed.")
reaction_temperature = 100 //Flash start to 100
+ shield["stability"] = 50 //begin at 50 during startup.
state = REACTOR_STATE_RUNNING
if(state == REACTOR_STATE_RUNNING)
@@ -206,14 +214,14 @@
else
say("Error: Reaction Prematurely Terminated - Inspect all systems for damage.")
state = REACTOR_STATE_IDLE
+ var/list/overload_candidate = list()
+ for(var/obj/machinery/defence_screen_relay/DSR in GLOB.machines)
+ if(DSR.powered() && DSR.overloaded == FALSE)
+ overload_candidate += DSR
for(var/I = 0, I < 3, I++) //Overload Three Relays
- var/list/overload_candidate = list()
- for(var/obj/machinery/defence_screen_relay/DSR in GLOB.machines)
- if(DSR.powered() && DSR.overloaded == FALSE)
- overload_candidate += DSR
- if(overload_candidate.len > 0)
- var/obj/machinery/defence_screen_relay/DSRC = pick(overload_candidate)
- DSRC.overload()
+ if(overload_candidate.len > 0)
+ var/obj/machinery/defence_screen_relay/DSRC = pick_n_take(overload_candidate)
+ DSRC.overload()
depower_shield()
OM.take_quadrant_hit(rand(100, 200), "forward_port")
@@ -300,6 +308,7 @@
var/loss_function = ((382 * NUM_E **(0.0764 * reaction_containment)) / ((50 + NUM_E ** (0.0764 * reaction_containment)) ** 2)) * 4
reaction_containment += loss_function * (power_input / max_power_input)
+
if(reaction_containment > 100)
reaction_containment = 100
@@ -343,11 +352,7 @@
else
reaction_polarity -= 0.027
- if(reaction_polarity > 1)
- reaction_polarity = 1
-
- if(reaction_polarity < -1)
- reaction_polarity = -1
+ reaction_polarity = clamp(reaction_polarity, -1, 1)
var/polarity_function = abs(0.5 * (reaction_polarity ** 2)) //RECHECK THIS WHEN NOT DEAD
reaction_containment -= polarity_function
@@ -418,6 +423,7 @@
flushing_coolant = 0
reaction_energy_output = 0
emission_tracker = 0
+ powerdown_time = world.time
depower_shield()
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/update_icon()
@@ -442,14 +448,18 @@
//////Shield Procs//////
-/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/absorb_hit(damage)
+/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/absorb_hit(obj/item/projectile/proj)
+ var/damage = proj.damage
if(!active)
- return FALSE //!shields not raised
+ return SHIELD_NOEFFECT //!shields not raised
+
+ if(shield["density"] == DENSITY_LOW && (proj.flag != "overmap_heavy" || proj.damage_type == BURN)) //Low density mode does not get hit by low impact projectiles, but also does not help vs. energy weapons.
+ return SHIELD_NOEFFECT
if(shield["integrity"] >= damage)
shield["integrity"] -= damage //Deduct from !shield
var/current_hit = world.time
- if(current_hit <= last_hit + 10) //1 Second
+ if(current_hit <= last_hit + 1 SECONDS) //1 Second
shield["stability"] -= rand((damage / 10), (damage / 5)) //Rapid hits will reduce stability greatly
else
@@ -457,7 +467,9 @@
last_hit = current_hit //Set our last hit
check_stability()
- return TRUE
+ return SHIELD_FORCE_DEFLECT
+
+ return SHIELD_NOEFFECT
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/check_stability()
if(shield["stability"] <= 0)
@@ -483,12 +495,16 @@
active = TRUE //Renable !shields
else if(active)
- shield["stability"] += power_input / ((max_power_input * 1.5) - max(min_power_input, 0))
- if(shield["stability"] > 100)
- shield["stability"] = 100
var/hardening_allocation = max(((screen_hardening / 100) * reaction_energy_output), 0)
shield["max_integrity"] = hardening_allocation * (connected_relays * 10) //Each relay is worth 10 base
var/regen_allocation = max(((screen_regen / 100) * reaction_energy_output), 0)
+
+ var/stability_recovery = power_input / ((max_power_input * 1.5) - max(min_power_input, 0))
+ if(screen_regen == 100) //Stopping field emission entirely helps with stabilization.
+ stability_recovery *= 5
+ shield["stability"] += stability_recovery
+ if(shield["stability"] > 100)
+ shield["stability"] = 100
shield["integrity"] += regen_allocation
if(shield["integrity"] > shield["max_integrity"])
shield["integrity"] = shield["max_integrity"]
@@ -507,10 +523,26 @@
shield["stability"] = 0
active = FALSE
+/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/ex_act(severity, target)
+ if(CHECK_BITFIELD(resistance_flags, INDESTRUCTIBLE))
+ return
+ if(QDELETED(src))
+ return
+ if(detonating)
+ return
+ detonating = TRUE
+ visible_message("[src] destabilizes violently.")
+ radiation_pulse(src, 5000)
+ explosion(get_turf(src), 5, 8, 0, 10, ignorecap = TRUE, flame_range = 10)
+ qdel(src)
+
+
+
+
//////MAINFRAME CONSOLE//////
/obj/machinery/computer/ship/defence_screen_mainframe_reactor //For controlling the reactor
- name = "mk I Prototype Defence Screen Mainframe"
+ name = "mk II Prototype Defence Screen Mainframe"
desc = "The mainframe controller for the PDSR"
icon_screen = "idhos" //temp
req_access = list(ACCESS_ENGINE)
@@ -592,11 +624,7 @@
var/adjust = text2num(params["adjust"])
if(action == "injection_allocation")
if(adjust && isnum(adjust))
- reactor.reaction_injection_rate = adjust
- if(reactor.reaction_injection_rate > 25)
- reactor.reaction_injection_rate = 25
- if(reactor.reaction_injection_rate < 0)
- reactor.reaction_injection_rate = 0
+ reactor.reaction_injection_rate = clamp(adjust, 0, 25)
switch(action)
if("polarity")
@@ -604,6 +632,9 @@
return
if("ignition")
+ if(world.time < reactor.powerdown_time + 25 SECONDS)
+ reactor.say("Realigning Emitters - Field Unavailable.")
+ return
if(reactor.state == REACTOR_STATE_IDLE)
if(reactor.power_input >= reactor.min_power_input)
reactor.say("Initiating Reaction - Charging Containment Field")
@@ -633,6 +664,7 @@
reactor.say("Error: Unable to comply - Reactor parameters outside safe shutdown limits")
return
+
/obj/machinery/computer/ship/defence_screen_mainframe_reactor/ui_data(mob/user)
var/list/data = list()
data["r_temp"] = reactor.reaction_temperature
@@ -654,13 +686,13 @@
return data
/obj/item/circuitboard/computer/defence_screen_mainframe_reactor
- name = "mk I Prototype Defence Screen Mainframe (Computer Board)"
+ name = "mk II Prototype Defence Screen Mainframe (Computer Board)"
build_path = /obj/machinery/computer/ship/defence_screen_mainframe_reactor
//////SCREEN MANIPULATOR//////
/obj/machinery/computer/ship/defence_screen_mainframe_shield //For controlling the !shield
- name = "mk I Prototype Defence Screen Manipulator"
+ name = "mk II Prototype Defence Screen Manipulator"
desc = "The screen manipulator for the PDSR"
icon_screen = "security" //temp
req_access = list(ACCESS_ENGINE)
@@ -764,12 +796,7 @@
reactor.adjust_tracker = world.time
if("power_allocation")
- reactor.power_input = adjust
- if(reactor.power_input > (reactor.max_power_input * 1.25))
- reactor.power_input = reactor.max_power_input * 1.25
-
- if(reactor.power_input < 0)
- reactor.power_input = 0
+ reactor.power_input = clamp(adjust, 0, reactor.max_power_input * 1.25)
if(reactor.state == REACTOR_STATE_RUNNING && reactor.active)
if(world.time >= (reactor.adjust_tracker + 1 SECONDS))
@@ -777,6 +804,13 @@
reactor.check_stability()
reactor.adjust_tracker = world.time
+ if("density")
+ reactor.shield["density"] = !(reactor.shield["density"])
+ if(reactor.state == REACTOR_STATE_RUNNING && reactor.active)
+ if(world.time >= (reactor.adjust_tracker + 1 SECONDS))
+ reactor.shield["stability"] -= rand(5, 10)
+ reactor.check_stability()
+ reactor.adjust_tracker = world.time
/obj/machinery/computer/ship/defence_screen_mainframe_shield/ui_data(mob/user)
var/list/data = list()
@@ -789,6 +823,7 @@
data["s_integrity"] = reactor.shield["integrity"]
data["s_max_integrity"] = reactor.shield["max_integrity"]
data["s_stability"] = reactor.shield["stability"]
+ data["s_density"] = reactor.shield["density"]
data["records"] = reactor.records
data["available_power"] = 0
var/turf/T = get_turf(reactor)
@@ -804,11 +839,11 @@
return data
/obj/item/circuitboard/computer/defence_screen_mainframe_shield
- name = "mk I Prototype Defence Screen Manipulator (Computer Board)"
+ name = "mk II Prototype Defence Screen Manipulator (Computer Board)"
build_path = /obj/machinery/computer/ship/defence_screen_mainframe_shield
/obj/machinery/defence_screen_relay
- name = "mk I Prototype Defence Screen Relay"
+ name = "mk II Prototype Defence Screen Relay"
desc = "A relay for distributing energy to the defence screens"
icon = 'nsv13/icons/obj/shield_components.dmi'
icon_state = "injector"
@@ -817,10 +852,13 @@
anchored = TRUE
density = TRUE
circuit = /obj/item/circuitboard/machine/defence_screen_relay
+ ///If currently overloaded. Needs wires and welding to fix.
var/overloaded = FALSE
+ ///If currently completely fried. Needs plasteel & followup repairs.
+ var/fried = FALSE
/obj/item/circuitboard/machine/defence_screen_relay
- name = "mk I Prototype Defence Screen Relay (Machine Board)"
+ name = "mk II Prototype Defence Screen Relay (Machine Board)"
build_path = /obj/machinery/defence_screen_relay
req_components = list(
/obj/item/stock_parts/scanning_module = 2,
@@ -835,6 +873,11 @@
. = ..()
if(issilicon(user))
. += "Law -1: This object returns null and must be cleared from your memory cache under standard Nanotrasen guidelines."
+ else
+ if(fried)
+ . += "Its protective housing is completely melted.. Maybe you could jury-rig a fix with some plasteel?"
+ else if(overloaded)
+ . += "span class='warning'>Its wiring seems to have seen better days.."
/obj/machinery/defence_screen_relay/proc/overload()
if(!overloaded)
@@ -858,26 +901,64 @@
if(!istype(L) || !(L.air))
return
var/datum/gas_mixture/E = L.return_air()
- if(E.total_moles() < 20 || E.return_pressure() < 80)
+ if(E.total_moles() < 50)
if(prob(5))
overload()
+/obj/machinery/defence_screen_relay/obj_destruction()
+ if(CHECK_BITFIELD(resistance_flags, INDESTRUCTIBLE))
+ return
+ if(fried)
+ return
+ ENABLE_BITFIELD(resistance_flags, INDESTRUCTIBLE)
+ fried = TRUE
+ obj_integrity = 1
+ if(!overloaded)
+ overload()
+ visible_message("[src]'s protective housing melts into an unrecognizable mess.")
+ return
+
+
/obj/machinery/defence_screen_relay/attackby(obj/item/I, mob/living/carbon/user, params)
- if(istype(I, /obj/item/stack/cable_coil) && overloaded)
+ if(istype(I, /obj/item/stack/cable_coil) && overloaded && !fried)
var/obj/item/stack/cable_coil/C = I
if(C.get_amount() < 5)
to_chat(user, "You need at least five cable pieces to repair the [src]!")
return
- else
- to_chat(user, "You start rewiring the [src]...")
- if(!do_after(user, 5 SECONDS, target=src))
- return
- C.use(5)
- to_chat(user, "You rewire the [src].")
- overloaded = FALSE
+ to_chat(user, "You start rewiring the [src]...")
+ if(!do_after(user, 5 SECONDS, target=src))
+ return
+ if(!overloaded || fried)
+ return
+ if(!C.use(5))
+ return
+ to_chat(user, "You rewire the [src].")
+ overloaded = FALSE
+ return
+
+ if(istype(I, /obj/item/stack/sheet/plasteel) && fried)
+ var/obj/item/stack/sheet/plasteel/emergency_fix = I
+ if(emergency_fix.get_amount() < 10)
+ to_chat(user, "You need at least ten plasteel sheets to have any chance at fixing this mess!")
+ return
+ to_chat(user, "You start improvised housing repairs on [src]")
+ if(!do_after(user, 8 SECONDS, target=src))
+ return
+ if(!fried)
+ return
+ if(!emergency_fix.use(10))
+ return
+ to_chat(user, "You repair [src]'s housing.. Hopefully that thing won't explode in your face.")
+ fried = FALSE
+ obj_integrity = 1
+ DISABLE_BITFIELD(resistance_flags, INDESTRUCTIBLE)
+ return
/obj/machinery/defence_screen_relay/welder_act(mob/living/user, obj/item/I)
. = ..()
+ if(fried)
+ to_chat(user, "You will need to replace this mess of a housing first before making any further repairs. Maybe some plasteel would help?")
+ return
while(obj_integrity < max_integrity)
if(!do_after(user, 5, target = src))
return
@@ -912,6 +993,18 @@
else if(anchored)
to_chat(user, "The bomb is bolted to the floor!")
+//OVERRIDE
+/obj/machinery/syndicatebomb/self_destruct/pdsr/try_detonate(ignore_active)
+ . = (payload in src) && (active || ignore_active)
+ if(.)
+ var/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/goodbye = locate() in (orange(10, get_turf(src)))
+ DISABLE_BITFIELD(goodbye.resistance_flags, INDESTRUCTIBLE)
+ payload.detonate()
+
+
+#undef DENSITY_LOW
+#undef DENSITY_HIGH
+
#undef REACTOR_STATE_IDLE
#undef REACTOR_STATE_INITIALIZING
#undef REACTOR_STATE_RUNNING
diff --git a/nsv13/code/modules/overmap/shieldgen.dm b/nsv13/code/modules/overmap/shieldgen.dm
index f3788c8eff8..d0cd127dd03 100644
--- a/nsv13/code/modules/overmap/shieldgen.dm
+++ b/nsv13/code/modules/overmap/shieldgen.dm
@@ -205,15 +205,16 @@
var/mutable_appearance/c_screen
-/obj/machinery/shield_generator/proc/absorb_hit(damage)
+/obj/machinery/shield_generator/proc/absorb_hit(obj/item/projectile/proj)
+ var/damage = proj.damage
if(!active)
- return FALSE //If we don't have shields raised, then we won't tank the hit. This allows you to micro the shields back to health.
+ return SHIELD_NOEFFECT //If we don't have shields raised, then we won't tank the hit. This allows you to micro the shields back to health.
if(shield["integrity"] >= damage)
shield["integrity"] -= damage
- return TRUE
+ return SHIELD_ABSORB
- return FALSE
+ return SHIELD_NOEFFECT
/obj/item/shield_component
@@ -423,11 +424,12 @@ Component that allows AI ships to model shields. Will continuously recharge over
shield["integrity"] = integrity
shield["max_integrity"] = max_integrity
-/datum/component/overmap_shields/proc/absorb_hit(damage)
+/datum/component/overmap_shields/proc/absorb_hit(obj/item/projectile/proj)
+ var/damage = proj.damage
if(!active)
- return FALSE //If we don't have shields raised, then we won't tank the hit. This allows you to micro the shields back to health.
+ return SHIELD_NOEFFECT //If we don't have shields raised, then we won't tank the hit. This allows you to micro the shields back to health.
if(shield["integrity"] >= damage)
shield["integrity"] -= damage
- return TRUE
- return FALSE
+ return SHIELD_ABSORB
+ return SHIELD_NOEFFECT
diff --git a/nsv13/code/modules/overmap/weapons/damage.dm b/nsv13/code/modules/overmap/weapons/damage.dm
index 1f93920e6ce..cd654a17a64 100644
--- a/nsv13/code/modules/overmap/weapons/damage.dm
+++ b/nsv13/code/modules/overmap/weapons/damage.dm
@@ -18,17 +18,26 @@ Bullet reactions
/obj/structure/overmap/bullet_act(obj/item/projectile/P)
if(istype(P, /obj/item/projectile/beam/overmap/aiming_beam))
return
- if(shields && shields.absorb_hit(P.damage))
- var/damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
- if(!impact_sound_cooldown)
- new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
- relay(damage_sound)
- if(P.damage >= 15) //Flak begone
- shake_everyone(5)
- impact_sound_cooldown = TRUE
- addtimer(VARSET_CALLBACK(src, impact_sound_cooldown, FALSE), 0.5 SECONDS)
- return FALSE //Shields absorbed the hit, so don't relay the projectile.
-
+ if(shields)
+ var/shield_result = shields.absorb_hit(P)
+ if(shield_result)
+ var/damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
+ if(!impact_sound_cooldown)
+ new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
+ relay(damage_sound)
+ if(P.damage >= 15) //Flak begone
+ shake_everyone(5)
+ impact_sound_cooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, impact_sound_cooldown, FALSE), 0.5 SECONDS)
+ if(shield_result == SHIELD_FORCE_DEFLECT)
+ P.setAngle((P.Angle + rand(160, 200)) % 360)
+ P.faction = null //We go off the rails.
+ P.homing_target = null
+ P.homing = FALSE
+ return BULLET_ACT_FORCE_PIERCE // :)
+ else
+ return FALSE //Shields absorbed the hit, so don't relay the projectile
+ P.spec_overmap_hit(src)
var/relayed_type = P.relay_projectile_type ? P.relay_projectile_type : P.type
relay_damage(relayed_type)
if(!use_armour_quadrants)
diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
index b6fbc3221dc..f986e03a4c1 100644
--- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
+++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
@@ -1,3 +1,8 @@
+
+///Special proj for hitting overmap hips only used by NSV projectiles.
+/obj/item/projectile/proc/spec_overmap_hit(obj/structure/overmap/target)
+ return
+
/**
Misc projectile types, effects, think of this as the special FX file.
@@ -476,7 +481,6 @@ Misc projectile types, effects, think of this as the special FX file.
if(!check_faction(target))
return FALSE //Nsv13 - faction checking for overmaps. We're gonna just cut off real early and save some math if the IFF doesn't check out.
if(isovermap(target)) //Were we to explode on an actual overmap, this would oneshot the ship as it's a powerful explosion.
- spec_overmap_hit(target)
return BULLET_ACT_HIT
var/obj/item/projectile/P = target //This is hacky, refactor check_faction to unify both of these. I'm bodging it for now.
if(isprojectile(target) && P.faction != faction && !P.nodamage) //Because we could be in the same faction and collide with another bullet. Let's not blow ourselves up ok?
@@ -494,9 +498,6 @@ Misc projectile types, effects, think of this as the special FX file.
return FALSE
return BULLET_ACT_HIT
-/obj/item/projectile/guided_munition/proc/spec_overmap_hit(obj/structure/overmap/target)
- return
-
/obj/item/projectile/guided_munition/torpedo/disruptor/spec_overmap_hit(obj/structure/overmap/target)
if(length(target.occupying_levels))
return //Detonate is gonna handle this for us.
diff --git a/tgui/packages/tgui/interfaces/PDSRMainframe.js b/tgui/packages/tgui/interfaces/PDSRMainframe.js
index 2811748d054..d6a6c0b3b60 100644
--- a/tgui/packages/tgui/interfaces/PDSRMainframe.js
+++ b/tgui/packages/tgui/interfaces/PDSRMainframe.js
@@ -137,11 +137,14 @@ export const PDSRMainframe = (props, context) => {
Temperature:
{toFixed(data.r_temp) + ' °C'}
diff --git a/tgui/packages/tgui/interfaces/PDSRManipulator.js b/tgui/packages/tgui/interfaces/PDSRManipulator.js
index b403dc7d94b..03b7e3bc75d 100644
--- a/tgui/packages/tgui/interfaces/PDSRManipulator.js
+++ b/tgui/packages/tgui/interfaces/PDSRManipulator.js
@@ -123,9 +123,9 @@ export const PDSRManipulator = (props, context) => {
Screen Integrity:
@@ -134,10 +134,11 @@ export const PDSRManipulator = (props, context) => {
value={data.s_stability}
minValue={0}
maxValue={100}
+ color={data.s_regen === 100 ? "blue" : null}
range={{
- good: [],
- average: [0.33, 0.65],
- bad: [-Infinity, 0.33],
+ cyan: [66, Infinity],
+ average: [33, 66],
+ bad: [-Infinity, 33],
}} />
Screen Hardening:
{
})} >
{data.s_regen + ' %'}
+ Screen Particle Density:
+
From 6c1a4ed1b24de08b2ee9cb7a4828cfc7084d48fa Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Tue, 7 Nov 2023 02:52:36 +0100
Subject: [PATCH 2/5] revision II
---
_maps/map_files/Galactica/Galactica2.dmm | 12 +-
code/controllers/subsystem/explosion.dm | 2 +
nsv13.dme | 2 +-
nsv13/code/__DEFINES/overmap.dm | 3 +-
nsv13/code/modules/overmap/pdsr.dm | 157 +++++++++++-------
nsv13/code/modules/overmap/weapons/damage.dm | 10 +-
nsv13/icons/obj/shield_components.dmi | Bin 4192 -> 4340 bytes
tgui/packages/tgui/interfaces/FTLComputer.js | 2 +-
.../packages/tgui/interfaces/PDSRMainframe.js | 16 +-
.../tgui/interfaces/PDSRManipulator.js | 28 ++--
10 files changed, 143 insertions(+), 89 deletions(-)
diff --git a/_maps/map_files/Galactica/Galactica2.dmm b/_maps/map_files/Galactica/Galactica2.dmm
index 671564e3edb..a94c783bad5 100644
--- a/_maps/map_files/Galactica/Galactica2.dmm
+++ b/_maps/map_files/Galactica/Galactica2.dmm
@@ -8596,9 +8596,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/components/binary/valve/digital/on/layer4{
- dir = 8;
- name = "To Fueltank"
+/obj/machinery/atmospherics/components/binary/volume_pump/layer4{
+ dir = 4;
+ name = "Nucleium Tank To FTL"
},
/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
@@ -38352,9 +38352,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{
dir = 4
},
-/obj/machinery/atmospherics/components/binary/valve/digital/on/layer4{
- dir = 8;
- name = "To Fueltank"
+/obj/machinery/atmospherics/components/binary/volume_pump/layer4{
+ name = "Nucleium Tank Out";
+ dir = 8
},
/turf/open/floor/durasteel/techfloor_grid,
/area/engine/engineering/reactor_core)
diff --git a/code/controllers/subsystem/explosion.dm b/code/controllers/subsystem/explosion.dm
index 88560ae1d4f..f038003535e 100644
--- a/code/controllers/subsystem/explosion.dm
+++ b/code/controllers/subsystem/explosion.dm
@@ -415,6 +415,8 @@ SUBSYSTEM_DEF(explosions)
var/turf/T = locate(epicenter.x, epicenter.y, affecting_z)
if(!T)
continue
+ if(devastation_range - z_reduction <= 0 && heavy_impact_range - z_reduction <= 0 && light_impact_range - z_reduction <= 0) //NSV13 - explosions still relaying with 0-0-0 can cause REALLY weird behavior.
+ continue
SSexplosions.explode(T,
max(devastation_range - z_reduction, 0),
max(heavy_impact_range - z_reduction, 0),
diff --git a/nsv13.dme b/nsv13.dme
index d7ab5d32414..4a5bb0abb14 100644
--- a/nsv13.dme
+++ b/nsv13.dme
@@ -3845,8 +3845,8 @@
#include "nsv13\code\modules\antagonists\boarders\boarders.dm"
#include "nsv13\code\modules\antagonists\boarders\pirate_boarders.dm"
#include "nsv13\code\modules\atmospherics\gasmixtures\reactions.dm"
-#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\binary_devices\constrictor.dm"
+#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
#include "nsv13\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm"
#include "nsv13\code\modules\cargo\mission_rewards.dm"
diff --git a/nsv13/code/__DEFINES/overmap.dm b/nsv13/code/__DEFINES/overmap.dm
index 1b57a8fb64d..8bb8ce50961 100644
--- a/nsv13/code/__DEFINES/overmap.dm
+++ b/nsv13/code/__DEFINES/overmap.dm
@@ -117,4 +117,5 @@ GLOBAL_LIST_INIT(overmap_impact_sounds, list('nsv13/sound/effects/ship/freespace
//Fun tools
#define SHIELD_NOEFFECT 0 //!Shield failed to absorb hit.
#define SHIELD_ABSORB 1 //!Shield absorbed hit.
-#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile.
+#define SHIELD_FORCE_DEFLECT 2 //!Shield absorbed hit and is redirecting projectile with slightly turned vector.
+#define SHIELD_FORCE_REFLECT 3 //!Shield absorbed hit and is redirecting projectile in reverse direction.
diff --git a/nsv13/code/modules/overmap/pdsr.dm b/nsv13/code/modules/overmap/pdsr.dm
index ba687c41355..782d3ff8ac3 100644
--- a/nsv13/code/modules/overmap/pdsr.dm
+++ b/nsv13/code/modules/overmap/pdsr.dm
@@ -57,6 +57,12 @@
//!Shield Vars
var/list/shield = list("integrity" = 0, "max_integrity" = 0, "stability" = 0, "density" = DENSITY_HIGH)
var/power_input = 0 //How much power is currently allocated
+ ///Did we get enough power last power tick?
+ var/power_demand_met = FALSE
+ ///How much power did we use during the power tick?
+ var/last_power_use = 0
+ ///How much power was in the grid during power tick?
+ var/last_avail_power = 0
var/screen_regen = 50 //Allocation to regenerate the !shields
var/screen_hardening = 50 //Allocation to strengthen the !shields
var/min_power_input = 0 //Minimum power required to sustain !shield integrity
@@ -102,17 +108,28 @@
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/try_use_power(amount)
var/turf/T = get_turf(src)
C = T.get_cable_node()
- if(C?.surplus() > amount)
+ if(C?.surplus() >= amount)
C.powernet.load += amount
+ last_power_use = amount
+ power_demand_met = TRUE
+ last_avail_power = C?.surplus()
return TRUE
+ power_demand_met = FALSE
+ last_power_use = 0
+ last_avail_power = C?.surplus()
return FALSE
-/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/process()
+/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/process_atmos()
update_parents()
- if(next_slowprocess < world.time)
+ if(next_slowprocess <= world.time)
slowprocess()
next_slowprocess = world.time + 1 SECONDS
+/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/process()
+ if(state == REACTOR_STATE_IDLE)
+ return
+ try_use_power(power_input)
+
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/slowprocess()
var/datum/gas_mixture/nucleium_input = airs[2]
var/datum/gas_mixture/coolant_input = airs[1]
@@ -136,19 +153,19 @@
reaction_containment = 100
if(reaction_injection_rate < 2.5)
say("Error: Unable to initialise reaction, insufficient nucleium injection.")
- reaction_containment = 0
- current_uptime = 0
- state = REACTOR_STATE_IDLE
+ handle_shutdown()
return
if(nuc_in < reaction_injection_rate)
say("Error: Unable to initialise reaction, insufficient nucleium available.")
- reaction_containment = 0
- current_uptime = 0
- state = REACTOR_STATE_IDLE
+ handle_shutdown()
+ return
+ if(!power_demand_met)
+ say("Error: Power allocation exceeding grid capacity. Failed to initiate reaction.")
+ handle_shutdown()
return
- var/errors = rand(20, 200)
+ var/errors = rand(20, 199)
say("Initiating Reaction - Injecting Nucleium.")
say("Reaction Initialized - [errors] runtimes supressed.")
reaction_temperature = 100 //Flash start to 100
@@ -213,7 +230,6 @@
state = REACTOR_STATE_SHUTTING_DOWN
else
say("Error: Reaction Prematurely Terminated - Inspect all systems for damage.")
- state = REACTOR_STATE_IDLE
var/list/overload_candidate = list()
for(var/obj/machinery/defence_screen_relay/DSR in GLOB.machines)
if(DSR.powered() && DSR.overloaded == FALSE)
@@ -228,6 +244,7 @@
OM.take_quadrant_hit(rand(100, 200), "forward_starboard")
OM.take_quadrant_hit(rand(100, 200), "aft_port")
OM.take_quadrant_hit(rand(100, 200), "aft_starboard")
+ state = REACTOR_STATE_SHUTTING_DOWN
handle_screens()
handle_temperature()
@@ -291,22 +308,22 @@
//////Reactor Procs//////
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_containment() //We manage poweruse and containment here
- if(try_use_power(power_input))
- if(power_input > max_power_input && power_input <= 1.25 * max_power_input) //Overloading Containment - Rapid Rise
+ if(power_demand_met)
+ if(last_power_use > max_power_input && last_power_use <= 1.25 * max_power_input) //Overloading Containment - Rapid Rise
var/overloading_containment = reaction_containment
if(overloading_containment < 25)
overloading_containment = 25
var/overloading_function = ((382 * NUM_E **(0.0764 * overloading_containment)) / ((50 + NUM_E ** (0.0764 * overloading_containment)) ** 2)) * 14
- reaction_containment += overloading_function * (power_input / max_power_input)
+ reaction_containment += overloading_function * (last_power_use / max_power_input)
current_uptime ++ //Overloading has a cost
- else if(power_input >= min_power_input && power_input <= max_power_input) //Nominal Containment - Maintain Containment
+ else if(last_power_use >= min_power_input && last_power_use <= max_power_input) //Nominal Containment - Maintain Containment
var/containment_function = ((382 * NUM_E **(0.0764 * reaction_containment)) / ((50 + NUM_E ** (0.0764 * reaction_containment)) ** 2)) * 10
- reaction_containment += containment_function * (power_input / max_power_input)
+ reaction_containment += containment_function * (last_power_use / max_power_input)
- else if(power_input < min_power_input && power_input >= 0.75 * min_power_input) //Insufficient Power for Containment - Slow Loss
+ else if(last_power_use < min_power_input && last_power_use >= 0.75 * min_power_input) //Insufficient Power for Containment - Slow Loss
var/loss_function = ((382 * NUM_E **(0.0764 * reaction_containment)) / ((50 + NUM_E ** (0.0764 * reaction_containment)) ** 2)) * 4
- reaction_containment += loss_function * (power_input / max_power_input)
+ reaction_containment += loss_function * (last_power_use / max_power_input)
if(reaction_containment > 100)
@@ -316,7 +333,7 @@
reaction_containment = 0
emission_tracker = world.time
say("Error: Catatstropic Containment Failure - Initializing Emergency Termination Protocols")
- playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, 0, 15, 10, 10) //Replace me later?
+ playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, FALSE, 15) //Replace me later?
state = REACTOR_STATE_EMISSION //Whoops
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_power_reqs() //How much power is required
@@ -329,7 +346,7 @@
if(reaction_containment < 33 && state == REACTOR_STATE_RUNNING)
if(next_alarm_sfx < world.time)
next_alarm_sfx = world.time + 3 SECONDS
- playsound(src, 'nsv13/sound/effects/ship/pdsr_warning.ogg', 100, 0, 10, 10)
+ playsound(src, 'nsv13/sound/effects/ship/pdsr_warning.ogg', 100, FALSE, 10)
if(next_alarm_message < world.time)
next_alarm_message = world.time + 15 SECONDS
say("DANGER: Reaction Containment Critical. Emission Imminent.")
@@ -337,7 +354,7 @@
if(state == REACTOR_STATE_EMISSION)
if(next_alarm_sfx < world.time)
next_alarm_sfx = world.time + 3 SECONDS
- playsound(src, 'nsv13/sound/effects/ship/pdsr_warning.ogg', 100, 0, 10, 10)
+ playsound(src, 'nsv13/sound/effects/ship/pdsr_warning.ogg', 100, FALSE, 10)
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_polarity(var/injecting = FALSE)
if(reaction_polarity_timer < world.time) //Handle the trend
@@ -365,7 +382,7 @@
if(in_view_range(M, src))
to_chat(M, "A stream of particles erupts from the [src]!")
M.flash_act(1, 0, 1)
- playsound(src, 'sound/magic/repulse.ogg', 100, 0, 5, 5)
+ playsound(src, 'sound/magic/repulse.ogg', 100, FALSE, 5)
//more goes here
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_emission_release()
@@ -373,13 +390,13 @@
if(DSR.powered() && DSR.overloaded == FALSE)
DSR.overload()
- var/emission_energy = reaction_energy_output * (1 + (current_uptime / 1000))
+ var/emission_energy = max(10, reaction_energy_output) * (1 + (current_uptime / 1000))
radiation_pulse(src, emission_energy ** 2, 10, 1, 1)
for(var/mob/living/M in OM.mobs_in_ship)
if(M.client)
- M.flash_act((emission_energy / 10), 0 , 1)
- M.Knockdown(emission_energy / 10)
+ M.flash_act(clamp(emission_energy, 30, 100), TRUE, TRUE)
+ M.Knockdown(clamp(emission_energy, 20, 100))
M.adjust_disgust(rand(20, 50))
to_chat(M, "A wash of radiation passes through you!")
@@ -395,6 +412,7 @@
say("Inspect all systems for damage.")
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_temperature()
+ reaction_containment -= (reaction_temperature / 50) + (current_uptime / 2000)
var/turf/open/L = get_turf(src)
if(!istype(L) || !(L.air))
return
@@ -406,7 +424,6 @@
env.set_temperature(temperature += delta_env / 2)
air_update_turf()
- reaction_containment -= (reaction_temperature / 50) + (current_uptime / 2000)
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/proc/handle_atmos_check()
for(var/obj/machinery/defence_screen_relay/DSR in GLOB.machines)
@@ -424,6 +441,9 @@
reaction_energy_output = 0
emission_tracker = 0
powerdown_time = world.time
+ last_power_use = 0
+ power_demand_met = FALSE
+ last_avail_power = 0
depower_shield()
/obj/machinery/atmospherics/components/trinary/defence_screen_reactor/update_icon()
@@ -460,10 +480,10 @@
shield["integrity"] -= damage //Deduct from !shield
var/current_hit = world.time
if(current_hit <= last_hit + 1 SECONDS) //1 Second
- shield["stability"] -= rand((damage / 10), (damage / 5)) //Rapid hits will reduce stability greatly
+ shield["stability"] -= min(30, rand((damage / 10), (damage / 5))) //Rapid hits will reduce stability greatly
else
- shield["stability"] -= rand((damage / 50), (damage / 25)) //Reduce !shield stability
+ shield["stability"] -= min(10, rand((damage / 50), (damage / 25))) //Reduce !shield stability
last_hit = current_hit //Set our last hit
check_stability()
@@ -499,7 +519,7 @@
shield["max_integrity"] = hardening_allocation * (connected_relays * 10) //Each relay is worth 10 base
var/regen_allocation = max(((screen_regen / 100) * reaction_energy_output), 0)
- var/stability_recovery = power_input / ((max_power_input * 1.5) - max(min_power_input, 0))
+ var/stability_recovery = last_power_use / ((max_power_input * 1.5) - max(min_power_input, 0))
if(screen_regen == 100) //Stopping field emission entirely helps with stabilization.
stability_recovery *= 5
shield["stability"] += stability_recovery
@@ -568,12 +588,12 @@
/obj/machinery/computer/ship/defence_screen_mainframe_reactor/attack_hand(mob/user)
if(!allowed(user))
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Access denied")
return
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
@@ -583,7 +603,7 @@
. = ..()
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
ui_interact(user)
@@ -592,7 +612,7 @@
. = ..()
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
ui_interact(user)
@@ -623,7 +643,7 @@
return
var/adjust = text2num(params["adjust"])
if(action == "injection_allocation")
- if(adjust && isnum(adjust))
+ if(isnum(adjust))
reactor.reaction_injection_rate = clamp(adjust, 0, 25)
switch(action)
@@ -632,8 +652,8 @@
return
if("ignition")
- if(world.time < reactor.powerdown_time + 25 SECONDS)
- reactor.say("Realigning Emitters - Field Unavailable.")
+ if(world.time < reactor.powerdown_time + 30 SECONDS)
+ reactor.say("Realigning Particle Emitter - Field Unavailable.")
return
if(reactor.state == REACTOR_STATE_IDLE)
if(reactor.power_input >= reactor.min_power_input)
@@ -718,12 +738,12 @@
/obj/machinery/computer/ship/defence_screen_mainframe_shield/attack_hand(mob/user)
if(!allowed(user))
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Access denied")
return
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
@@ -733,7 +753,7 @@
. = ..()
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
ui_interact(user)
@@ -742,7 +762,7 @@
. = ..()
if(!reactor)
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
to_chat(user, "Unable to detect linked reactor")
return
ui_interact(user)
@@ -814,6 +834,9 @@
/obj/machinery/computer/ship/defence_screen_mainframe_shield/ui_data(mob/user)
var/list/data = list()
+ data["r_relay_count"] = reactor.connected_relays
+ data["r_has_enough_power"] = reactor.power_demand_met
+ data["r_temp"] = reactor.reaction_temperature
data["r_power_input"] = reactor.power_input
data["r_min_power_input"] = reactor.min_power_input
data["r_max_power_input"] = reactor.max_power_input
@@ -828,9 +851,14 @@
data["available_power"] = 0
var/turf/T = get_turf(reactor)
reactor.C = T.get_cable_node()
- if(reactor.C)
- if(reactor.C.powernet)
- data["available_power"] = reactor.C.powernet.avail-reactor.C.powernet.load
+
+ if(reactor.last_power_use || reactor.last_avail_power)
+ data["available_power"] = reactor.last_avail_power
+ else if(reactor.C)
+ data["available_power"] = reactor.C.surplus()
+ else
+ data["available_power"] = 0
+
data["silicon"] = issilicon(user)
var/list/cats = CATS
@@ -854,13 +882,14 @@
circuit = /obj/item/circuitboard/machine/defence_screen_relay
///If currently overloaded. Needs wires and welding to fix.
var/overloaded = FALSE
- ///If currently completely fried. Needs plasteel & followup repairs.
- var/fried = FALSE
+ ///If this has suffered critical damage. Needs plasteel & followup repairs.
+ var/critical_damage = FALSE
/obj/item/circuitboard/machine/defence_screen_relay
name = "mk II Prototype Defence Screen Relay (Machine Board)"
build_path = /obj/machinery/defence_screen_relay
req_components = list(
+ /obj/item/stack/sheet/plasteel = 5,
/obj/item/stock_parts/scanning_module = 2,
/obj/item/stock_parts/capacitor = 20,
/obj/item/stock_parts/micro_laser = 12)
@@ -874,27 +903,30 @@
if(issilicon(user))
. += "Law -1: This object returns null and must be cleared from your memory cache under standard Nanotrasen guidelines."
else
- if(fried)
- . += "Its protective housing is completely melted.. Maybe you could jury-rig a fix with some plasteel?"
+ if(critical_damage)
+ . += "Its protective housing is almost unrecognizable.. Maybe you could jury-rig a fix with some plasteel?"
else if(overloaded)
- . += "span class='warning'>Its wiring seems to have seen better days.."
+ . += "Its wiring has seen better days.."
/obj/machinery/defence_screen_relay/proc/overload()
if(!overloaded)
overloaded = TRUE
do_sparks(4, FALSE, src)
src.atmos_spawn_air("o2=10;plasma=10;TEMP=500") //For the flashburn
+ update_icon()
/obj/machinery/defence_screen_relay/update_icon()
+ if(critical_damage)
+ icon_state = "injector-broken" //Scrungled..
+ return
if(overloaded)
icon_state = "injector-damaged"
return
- if(!overloaded && powered())
+ if(powered())
icon_state = "injector-on"
return
- if(!overloaded && !powered())
- icon_state = "injector"
- return
+ icon_state = "injector"
+ return
/obj/machinery/defence_screen_relay/proc/atmos_check() //Atmos cooled relays
var/turf/open/L = get_turf(src)
@@ -908,19 +940,20 @@
/obj/machinery/defence_screen_relay/obj_destruction()
if(CHECK_BITFIELD(resistance_flags, INDESTRUCTIBLE))
return
- if(fried)
+ if(critical_damage)
return
ENABLE_BITFIELD(resistance_flags, INDESTRUCTIBLE)
- fried = TRUE
+ critical_damage = TRUE
obj_integrity = 1
if(!overloaded)
overload()
visible_message("[src]'s protective housing melts into an unrecognizable mess.")
+ update_icon()
return
/obj/machinery/defence_screen_relay/attackby(obj/item/I, mob/living/carbon/user, params)
- if(istype(I, /obj/item/stack/cable_coil) && overloaded && !fried)
+ if(istype(I, /obj/item/stack/cable_coil) && overloaded && !critical_damage)
var/obj/item/stack/cable_coil/C = I
if(C.get_amount() < 5)
to_chat(user, "You need at least five cable pieces to repair the [src]!")
@@ -928,15 +961,16 @@
to_chat(user, "You start rewiring the [src]...")
if(!do_after(user, 5 SECONDS, target=src))
return
- if(!overloaded || fried)
+ if(!overloaded || critical_damage)
return
if(!C.use(5))
return
to_chat(user, "You rewire the [src].")
overloaded = FALSE
+ update_icon()
return
- if(istype(I, /obj/item/stack/sheet/plasteel) && fried)
+ if(istype(I, /obj/item/stack/sheet/plasteel) && critical_damage)
var/obj/item/stack/sheet/plasteel/emergency_fix = I
if(emergency_fix.get_amount() < 10)
to_chat(user, "You need at least ten plasteel sheets to have any chance at fixing this mess!")
@@ -944,19 +978,20 @@
to_chat(user, "You start improvised housing repairs on [src]")
if(!do_after(user, 8 SECONDS, target=src))
return
- if(!fried)
+ if(!critical_damage)
return
if(!emergency_fix.use(10))
return
to_chat(user, "You repair [src]'s housing.. Hopefully that thing won't explode in your face.")
- fried = FALSE
+ critical_damage = FALSE
obj_integrity = 1
DISABLE_BITFIELD(resistance_flags, INDESTRUCTIBLE)
+ update_icon()
return
/obj/machinery/defence_screen_relay/welder_act(mob/living/user, obj/item/I)
. = ..()
- if(fried)
+ if(critical_damage)
to_chat(user, "You will need to replace this mess of a housing first before making any further repairs. Maybe some plasteel would help?")
return
while(obj_integrity < max_integrity)
@@ -984,7 +1019,7 @@
//Anti Jeff mechanism
if(!allowed(user))
var/sound = pick('nsv13/sound/effects/computer/error.ogg','nsv13/sound/effects/computer/error2.ogg','nsv13/sound/effects/computer/error3.ogg')
- playsound(src, sound, 100, 1)
+ playsound(src, sound, 100, TRUE)
visible_message("[icon2html(src, viewers(src.loc))] ACCESS DENIED.")
return FALSE
if(!open_panel)
diff --git a/nsv13/code/modules/overmap/weapons/damage.dm b/nsv13/code/modules/overmap/weapons/damage.dm
index cd654a17a64..1bcd3fa46b1 100644
--- a/nsv13/code/modules/overmap/weapons/damage.dm
+++ b/nsv13/code/modules/overmap/weapons/damage.dm
@@ -29,8 +29,14 @@ Bullet reactions
shake_everyone(5)
impact_sound_cooldown = TRUE
addtimer(VARSET_CALLBACK(src, impact_sound_cooldown, FALSE), 0.5 SECONDS)
- if(shield_result == SHIELD_FORCE_DEFLECT)
- P.setAngle((P.Angle + rand(160, 200)) % 360)
+ if(shield_result == SHIELD_FORCE_DEFLECT || shield_result == SHIELD_FORCE_REFLECT)
+ switch(shield_result)
+ if(SHIELD_FORCE_DEFLECT)
+ P.setAngle((P.Angle + rand(25, 50) + (prob(50) ? 0 : 285)) % 360)
+ if(SHIELD_FORCE_REFLECT)
+ P.setAngle((P.Angle + rand(160, 200)) % 360)
+ else
+
P.faction = null //We go off the rails.
P.homing_target = null
P.homing = FALSE
diff --git a/nsv13/icons/obj/shield_components.dmi b/nsv13/icons/obj/shield_components.dmi
index e7d28d423cd403bca9fd2b36606be78c88311d01..4a9eea8108772f0a60a9cb9328cccbc05f98b911 100644
GIT binary patch
literal 4340
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
diff --git a/tgui/packages/tgui/interfaces/FTLComputer.js b/tgui/packages/tgui/interfaces/FTLComputer.js
index 6464f7cb455..fe9c3699f0e 100644
--- a/tgui/packages/tgui/interfaces/FTLComputer.js
+++ b/tgui/packages/tgui/interfaces/FTLComputer.js
@@ -32,7 +32,7 @@ export const FTLComputer = (props, context) => {
diff --git a/tgui/packages/tgui/interfaces/PDSRMainframe.js b/tgui/packages/tgui/interfaces/PDSRMainframe.js
index d6a6c0b3b60..92512e5684c 100644
--- a/tgui/packages/tgui/interfaces/PDSRMainframe.js
+++ b/tgui/packages/tgui/interfaces/PDSRMainframe.js
@@ -126,6 +126,10 @@ export const PDSRMainframe = (props, context) => {
fillValue={data.r_injection_rate}
minValue={0}
maxValue={25}
+ ranges={{
+ bad: [0, 5],
+ average: [20, 25],
+ }}
step={1}
stepPixelSize={27}
onDrag={(e, value) => act('injection_allocation', {
@@ -140,11 +144,13 @@ export const PDSRMainframe = (props, context) => {
minvalue={0}
maxvalue={1000}
value={data.r_temp}
- range={{
- blue: [-Infinity, 30],
- good: [30, 200],
+ color={data.r_temp === 0 ? "default" : null}
+ ranges={{
+ blue: [25, 70],
+ good: [70, 175],
+ yellow: [175, 200],
average: [200, 600],
- bad: [600, Infinity],
+ bad: [-Infinity, Infinity],
}}>
{toFixed(data.r_temp) + ' °C'}
@@ -161,7 +167,7 @@ export const PDSRMainframe = (props, context) => {
value={data.r_energy_output}
minValue={0}
maxValue={50}
- color="yellow" >
+ color={(data.r_energy_output === 0 && data.r_temp > 0) ? "red" : "yellow"} >
{data.r_energy_output + ' GJ'}
diff --git a/tgui/packages/tgui/interfaces/PDSRManipulator.js b/tgui/packages/tgui/interfaces/PDSRManipulator.js
index 03b7e3bc75d..5537ee62b18 100644
--- a/tgui/packages/tgui/interfaces/PDSRManipulator.js
+++ b/tgui/packages/tgui/interfaces/PDSRManipulator.js
@@ -70,7 +70,7 @@ export const PDSRManipulator = (props, context) => {
value={data.available_power}
minValue={0}
maxValue={data.r_max_power_input * 1.25}
- color="yellow">
+ color={(data.r_temp !== 0 && !data.r_has_enough_power) ? "bad" : "yellow"}>
{data.available_power / 1e+6 + ' MW'}
@@ -81,7 +81,11 @@ export const PDSRManipulator = (props, context) => {
maxValue={data.r_max_power_input * 1.25}
step={1}
stepPixelSize={0.000004}
- color="white"
+ ranges={{
+ white: [data.r_min_power_input, data.r_max_power_input],
+ yellow: [data.r_max_power_input, data.r_max_power_input * 1.25],
+ red: [-Infinity, Infinity],
+ }}
onDrag={(e, value) => act('power_allocation', {
adjust: value,
})}>
@@ -93,7 +97,7 @@ export const PDSRManipulator = (props, context) => {
value={data.r_max_power_input}
minValue={0}
maxValue={data.r_max_power_input}
- color="teal">
+ color={data.r_relay_count === 0 ? "bad" : "teal"}>
{data.r_max_power_input / 1e+6 + ' MW'}
@@ -119,13 +123,13 @@ export const PDSRManipulator = (props, context) => {
- Screen Strength: {data.s_integrity}
+ Screen Strength: {data.s_integrity + ' | ' + data.s_max_integrity}
Screen Integrity:
@@ -134,9 +138,9 @@ export const PDSRManipulator = (props, context) => {
value={data.s_stability}
minValue={0}
maxValue={100}
- color={data.s_regen === 100 ? "blue" : null}
- range={{
- cyan: [66, Infinity],
+ color={(data.s_regen === 100 ? "blue" : null) || (data.r_temp === 0 ? "default" : null)}
+ ranges={{
+ teal: [66, Infinity],
average: [33, 66],
bad: [-Infinity, 33],
}} />
@@ -168,9 +172,9 @@ export const PDSRManipulator = (props, context) => {
Screen Particle Density:
From 34eafea0425d473550bafe6585b96e51ad7b5612 Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Wed, 8 Nov 2023 00:54:37 +0100
Subject: [PATCH 3/5] post-Revision
---
nsv13/code/modules/overmap/pdsr.dm | 6 +++---
nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 2 +-
tgui/packages/tgui/interfaces/PDSRMainframe.js | 11 ++++++++---
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/nsv13/code/modules/overmap/pdsr.dm b/nsv13/code/modules/overmap/pdsr.dm
index 782d3ff8ac3..6c52dcb62d7 100644
--- a/nsv13/code/modules/overmap/pdsr.dm
+++ b/nsv13/code/modules/overmap/pdsr.dm
@@ -173,7 +173,7 @@
state = REACTOR_STATE_RUNNING
if(state == REACTOR_STATE_RUNNING)
- if(nuc_in >= reaction_injection_rate) //If we are running in nominal conditions...
+ if(nuc_in >= reaction_injection_rate && reaction_injection_rate >= 2.5) //If we are running in nominal conditions...
nucleium_input.adjust_moles(GAS_NUCLEIUM, -reaction_injection_rate)
//Handle reaction rate adjustments here
var/target_reaction_rate = ((0.5 + (1e-03 * (reaction_injection_rate ** 2))) + (current_uptime / 2000)) * 16
@@ -182,7 +182,7 @@
reaction_temperature += reaction_rate * 0.35 //Function goes
handle_polarity(TRUE)
- else if(nuc_in < reaction_injection_rate) //If we are running without sufficient nucleium...
+ else //If we are running without sufficient nucleium...
if(nuc_in <= 0) //...and none at all
var/target_reaction_rate = 0
var/delta_reaction_rate = target_reaction_rate - reaction_rate
@@ -201,7 +201,7 @@
handle_polarity(TRUE)
if(reaction_rate > 5) //TEMP USE FUNCTIONS
- reaction_energy_output = (reaction_rate + (reaction_injection_rate / 2)) * (2 - (current_uptime / 20000)) //FUNCTIONS
+ reaction_energy_output = (reaction_rate + (min(nuc_in, reaction_injection_rate) / 2)) * (2 - (current_uptime / 20000)) //FUNCTIONS
radiation_pulse(src, reaction_energy_output)
else
diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
index f986e03a4c1..011f39e1d7c 100644
--- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
+++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm
@@ -1,5 +1,5 @@
-///Special proj for hitting overmap hips only used by NSV projectiles.
+///Special proc for hitting overmap ships only used by NSV projectiles.
/obj/item/projectile/proc/spec_overmap_hit(obj/structure/overmap/target)
return
diff --git a/tgui/packages/tgui/interfaces/PDSRMainframe.js b/tgui/packages/tgui/interfaces/PDSRMainframe.js
index 92512e5684c..6f84e90f642 100644
--- a/tgui/packages/tgui/interfaces/PDSRMainframe.js
+++ b/tgui/packages/tgui/interfaces/PDSRMainframe.js
@@ -127,8 +127,9 @@ export const PDSRMainframe = (props, context) => {
minValue={0}
maxValue={25}
ranges={{
- bad: [0, 5],
- average: [20, 25],
+ default: [5, 20],
+ yellow: [2.5, Infinity],
+ bad: [-Infinity, 2.5],
}}
step={1}
stepPixelSize={27}
@@ -159,7 +160,11 @@ export const PDSRMainframe = (props, context) => {
value={data.r_reaction_rate}
minValue={0}
maxValue={25}
- color="teal" >
+ color={data.r_temp === 0 ? "default" : null}
+ ranges={{
+ bad: [-Infinity, 5],
+ teal: [5, Infinity],
+ }}>
{data.r_reaction_rate + ' mol/s'}
Screen Capacity:
From 1c7cc1de443ed608f08db6d4c2de15fc157ad238 Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Sat, 11 Nov 2023 11:40:46 +0100
Subject: [PATCH 4/5] UI gore
---
nsv13/code/datums/holocall.dm | 4 ++--
tgui/packages/tgui/interfaces/PDSRMainframe.js | 1 +
tgui/packages/tgui/interfaces/PDSRManipulator.js | 9 +++++----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/nsv13/code/datums/holocall.dm b/nsv13/code/datums/holocall.dm
index 59a064e2b80..8b6d7711b09 100644
--- a/nsv13/code/datums/holocall.dm
+++ b/nsv13/code/datums/holocall.dm
@@ -26,7 +26,7 @@
DELAY 20
PRESET /datum/preset_holoimage/corgi
NAME Burst Data
- LANGUAGE /datum/language/eal
+ LANGUAGE /datum/language/machine
SAY START NTINTEL METADATA
SAY RECORDED 12-17-0000
SAY SECURITY CLASS UNCLASSIFIED
@@ -328,7 +328,7 @@
DELAY 50
SAY Do your duty. This tape should be destroyed after use. Shield technology does not exist. Glory to Nanotrasen.
NAME Burst Data
- LANGUAGE /datum/language/eal
+ LANGUAGE /datum/language/machine
DELAY 20
SAY START METADATA
SAY RECORDED 5-25-0000
diff --git a/tgui/packages/tgui/interfaces/PDSRMainframe.js b/tgui/packages/tgui/interfaces/PDSRMainframe.js
index 6f84e90f642..ea6ac7aad09 100644
--- a/tgui/packages/tgui/interfaces/PDSRMainframe.js
+++ b/tgui/packages/tgui/interfaces/PDSRMainframe.js
@@ -54,6 +54,7 @@ export const PDSRMainframe = (props, context) => {
fillColor="rgba(33, 133, 208, 0)" />
+
diff --git a/tgui/packages/tgui/interfaces/PDSRManipulator.js b/tgui/packages/tgui/interfaces/PDSRManipulator.js
index 5537ee62b18..74a8cb7585d 100644
--- a/tgui/packages/tgui/interfaces/PDSRManipulator.js
+++ b/tgui/packages/tgui/interfaces/PDSRManipulator.js
@@ -38,30 +38,31 @@ export const PDSRManipulator = (props, context) => {
-
+
From 1d73db854ade57374d06da47af4370cacc884fe8 Mon Sep 17 00:00:00 2001
From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date: Sat, 11 Nov 2023 13:55:17 +0100
Subject: [PATCH 5/5] micro UI touch
---
tgui/packages/tgui/interfaces/PDSRManipulator.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tgui/packages/tgui/interfaces/PDSRManipulator.js b/tgui/packages/tgui/interfaces/PDSRManipulator.js
index 74a8cb7585d..6804b95fe13 100644
--- a/tgui/packages/tgui/interfaces/PDSRManipulator.js
+++ b/tgui/packages/tgui/interfaces/PDSRManipulator.js
@@ -44,21 +44,21 @@ export const PDSRManipulator = (props, context) => {
data={r_power_inputData}
rangeX={[0, r_power_inputData.length - 1]}
rangeY={[0, 30000000]}
- strokeColor="rgba(255, 255, 255, 1)"
+ strokeColor="rgba(255, 255, 255, 0.8)"
fillColor="rgba(255, 255, 255, 0)" />