mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Radiation Rework (#28320)
* initial changes * Rad wave is working. now to implement the rest * Makes the waves square * Makes wave square * multiplies the strength in all instances of radiation_pulse by 4 because each pulse makes one wave instead of 4 now * Undef thing and apply suggestion * Make radiation_pulse() not radiate the radiation source and implements contamination * Adds contamination to uranium walls and meteors * Fixes stuff * Handle some contamination on attack still need to take care of meteors * Fixed the meteor stuff * Introduce emission types * moves contaminate_touch to an atom proc and renames it to contaminate_atom * deduplicates some contamination code * Move inherent radioactivity to a component and signals from the atom vars and behaviour * fix some things with the new component * Update inherent_radioactivity.dm * implement contaminating things that hit things that are inherently radioactive * window things * adds emission type to the rad_act call * Changes radiation insulation values on a bunch of stuff * fixes radioactive component radiating the wrong type * more adjustments * refactros rad_act * adjustments to collector power production * Adds plastitaniumglass windows and makes further adjustments * Adds sprites to the shards and plastitanium directional window * Update misc_cleanables.dm * removes alpha rad insulation from floor turfs * Fixes a bug with the starting tile of radiation waves * More adjustments * Adjusting singularity rad production * reduces window half life a bit to make power smoother and buffs full window rad conversion * Strengthens gamma and beta radiation effect on mobs. * Makes radsuit block radiation completely * Fixes Geiger Counters * Fixes contamination not irradiating the contaminated thing * Fixes inherent radioactivity not processing. Also makes it stop processing when a nuke core is contained * Fixes ghost contamination * Adds info to the collector * Handles alpha radiation better on humans and changes some instances of rad_act to base_rad_act * oops * adjustments and fixes to alpha rad handling on mobs * Make collector info more compact * Core no longer radiates and contaminates from within the nuke until the plates are removed * Contamination no longer counts as being inside a mob(it is supposed to be surface level) * Adds inherent radioactivity to a bunch of uranium things. makes it all process. * Nerf full windows * Adjustments to collector and fulltile window radiation absorption * Reduces passive contamination, especially while on the floor * Adds different rad types to the geiger counter and fixes a runtime * Makes full tile windows strong again and disallows building them on top of collectors * adds emissive blockers to the rad blacklist and gives windows and collectors priority when irradiating for increased consistency * Gives each contamination type it's own color. * Gives each contamination type it's own color. And makes the rad hud display them separately * Changes how much the radiation wave affects the source tile, adds decay for performance reasons and adjusts collector parameters as well as SM and singulo rad production * improves performance at very high rad amounts * Fixes supermatter sliver box not containing radiation * Restores supermatter sliver to old behaviour(not inherently radioactive) * Slight nerf to fulltile windows and removes an unnecessary multiplication from rad wave processing * Removes redundant line from window rad act * Fixes radiation waves ignoring walls * fixes it better * more adjustments to collector stats * Adjustment to collector gamma absorption * increases grille beta blocking * Review changes
This commit is contained in:
committed by
GitHub
parent
e29a599118
commit
ebf7fdbfd2
@@ -116,7 +116,8 @@
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
|
||||
damage_deflection = 0
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_MEDIUM_INSULATION
|
||||
rad_insulation_beta = RAD_MEDIUM_INSULATION
|
||||
rad_insulation_gamma = RAD_LIGHT_INSULATION
|
||||
var/initial_state
|
||||
var/state_open = FALSE
|
||||
var/is_operating = FALSE
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
if(prob(50))
|
||||
empulse(src, 4, 10)
|
||||
else
|
||||
radiation_pulse(get_turf(src), 500, 2)
|
||||
radiation_pulse(get_turf(src), 2000, BETA_RAD)
|
||||
|
||||
/obj/structure/fusionreactor/wrench_act(mob/user, obj/item/I)
|
||||
. = TRUE
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
icon_state = "wall-0"
|
||||
base_icon_state = "wall"
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_MEDIUM_INSULATION
|
||||
rad_insulation_beta = RAD_BETA_BLOCKER
|
||||
rad_insulation_gamma = RAD_LIGHT_INSULATION
|
||||
layer = TURF_LAYER
|
||||
|
||||
var/mineral = /obj/item/stack/sheet/metal
|
||||
@@ -63,6 +64,7 @@
|
||||
toggle(user)
|
||||
|
||||
/obj/structure/falsewall/attack_hand(mob/user)
|
||||
. = ..()
|
||||
toggle(user)
|
||||
|
||||
/obj/structure/falsewall/proc/toggle(mob/user)
|
||||
@@ -217,23 +219,10 @@
|
||||
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
|
||||
canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS)
|
||||
|
||||
/obj/structure/falsewall/uranium/attackby__legacy__attackchain(obj/item/W as obj, mob/user as mob, params)
|
||||
radiate()
|
||||
..()
|
||||
|
||||
/obj/structure/falsewall/uranium/attack_hand(mob/user as mob)
|
||||
radiate()
|
||||
..()
|
||||
|
||||
/obj/structure/falsewall/uranium/proc/radiate()
|
||||
if(!active)
|
||||
if(world.time > last_event + 1.5 SECONDS)
|
||||
active = TRUE
|
||||
radiation_pulse(src, 150)
|
||||
for(var/turf/simulated/wall/mineral/uranium/T in orange(1, src))
|
||||
T.radiate()
|
||||
last_event = world.time
|
||||
active = FALSE
|
||||
/obj/structure/falsewall/uranium/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/component/inherent_radioactivity/radioactivity = AddComponent(/datum/component/inherent_radioactivity, 50, 0, 0, 1.5)
|
||||
START_PROCESSING(SSradiation, radioactivity)
|
||||
/*
|
||||
* Other misc falsewall types
|
||||
*/
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
density = TRUE
|
||||
layer = BELOW_OBJ_LAYER
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_VERY_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_HEAVY_INSULATION
|
||||
cares_about_temperature = TRUE
|
||||
var/state = GIRDER_NORMAL
|
||||
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
max_integrity = 50
|
||||
integrity_failure = 20
|
||||
cares_about_temperature = TRUE
|
||||
rad_insulation_beta = RAD_BETA_BLOCKER
|
||||
var/rods_type = /obj/item/stack/rods
|
||||
var/rods_amount = 2
|
||||
var/rods_broken = 1
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
/obj/structure/holosign/barrier/engineering
|
||||
icon_state = "holosign_engi"
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_LIGHT_INSULATION
|
||||
|
||||
/obj/structure/holosign/barrier/atmos
|
||||
name = "holo firelock"
|
||||
@@ -81,7 +81,7 @@
|
||||
anchored = TRUE
|
||||
alpha = 150
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_LIGHT_INSULATION
|
||||
|
||||
/obj/structure/holosign/barrier/atmos/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
max_integrity = 200
|
||||
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 50, ACID = 50)
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_MEDIUM_INSULATION
|
||||
rad_insulation_beta = RAD_BETA_BLOCKER
|
||||
rad_insulation_gamma = RAD_LIGHT_INSULATION
|
||||
var/initial_state
|
||||
var/state_open = FALSE
|
||||
var/is_operating = FALSE
|
||||
@@ -144,13 +145,12 @@
|
||||
icon_state = "silver"
|
||||
sheetType = /obj/item/stack/sheet/mineral/silver
|
||||
max_integrity = 300
|
||||
rad_insulation = RAD_HEAVY_INSULATION
|
||||
|
||||
/obj/structure/mineral_door/gold
|
||||
name = "gold door"
|
||||
icon_state = "gold"
|
||||
sheetType = /obj/item/stack/sheet/mineral/gold
|
||||
rad_insulation = RAD_HEAVY_INSULATION
|
||||
rad_insulation_gamma = RAD_MEDIUM_INSULATION
|
||||
|
||||
/obj/structure/mineral_door/uranium
|
||||
name = "uranium door"
|
||||
@@ -167,7 +167,7 @@
|
||||
|
||||
/obj/structure/mineral_door/transparent
|
||||
opacity = FALSE
|
||||
rad_insulation = RAD_VERY_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_MEDIUM_INSULATION
|
||||
|
||||
/obj/structure/mineral_door/transparent/operate_update()
|
||||
density = !density
|
||||
@@ -205,7 +205,6 @@
|
||||
icon_state = "diamond"
|
||||
sheetType = /obj/item/stack/sheet/mineral/diamond
|
||||
max_integrity = 1000
|
||||
rad_insulation = RAD_EXTREME_INSULATION
|
||||
|
||||
/obj/structure/mineral_door/wood
|
||||
name = "wood door"
|
||||
@@ -216,7 +215,7 @@
|
||||
hardness = 1
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 200
|
||||
rad_insulation = RAD_VERY_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_VERY_LIGHT_INSULATION
|
||||
|
||||
/obj/structure/mineral_door/wood/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -71,25 +71,10 @@
|
||||
desc = "This statue has a sickening green colour."
|
||||
icon_state = "eng"
|
||||
|
||||
/obj/structure/statue/uranium/attackby__legacy__attackchain(obj/item/W, mob/user, params)
|
||||
radiate()
|
||||
return ..()
|
||||
|
||||
/obj/structure/statue/uranium/Bumped(atom/user)
|
||||
radiate()
|
||||
..()
|
||||
|
||||
/obj/structure/statue/uranium/attack_hand(mob/user)
|
||||
radiate()
|
||||
..()
|
||||
|
||||
/obj/structure/statue/uranium/proc/radiate()
|
||||
if(!active)
|
||||
if(world.time > last_event + 1.5 SECONDS)
|
||||
active = TRUE
|
||||
radiation_pulse(src, 30)
|
||||
last_event = world.time
|
||||
active = FALSE
|
||||
/obj/statue/uranium/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/component/inherent_radioactivity/radioactivity = AddComponent(/datum/component/inherent_radioactivity, 150, 0, 0, 1.5)
|
||||
START_PROCESSING(SSradiation, radioactivity)
|
||||
|
||||
/obj/structure/statue/plasma
|
||||
max_integrity = 200
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
max_integrity = 25
|
||||
resistance_flags = ACID_PROOF
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 100)
|
||||
rad_insulation = RAD_VERY_LIGHT_INSULATION
|
||||
rad_insulation_beta = RAD_MEDIUM_INSULATION
|
||||
cares_about_temperature = TRUE
|
||||
var/ini_dir = null
|
||||
var/state = WINDOW_OUT_OF_FRAME
|
||||
@@ -40,6 +40,13 @@
|
||||
var/env_smash_level = ENVIRONMENT_SMASH_STRUCTURES
|
||||
/// How well this window resists superconductivity.
|
||||
var/superconductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
|
||||
/// How much we get activated by gamma radiation
|
||||
var/rad_conversion_amount = 0
|
||||
|
||||
|
||||
/obj/structure/window/rad_act(atom/source, amount, emission_type)
|
||||
if(emission_type == GAMMA_RAD && amount * rad_conversion_amount > RAD_BACKGROUND_RADIATION)
|
||||
AddComponent(/datum/component/radioactive, amount * rad_conversion_amount, src, BETA_RAD, 60)
|
||||
|
||||
/obj/structure/window/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -518,7 +525,7 @@
|
||||
reinf = TRUE
|
||||
heat_resistance = 1300
|
||||
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 25, RAD = 100, FIRE = 80, ACID = 100)
|
||||
rad_insulation = RAD_NO_INSULATION
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
max_integrity = 50
|
||||
explosion_block = 1
|
||||
glass_type = /obj/item/stack/sheet/rglass
|
||||
@@ -631,7 +638,7 @@
|
||||
|
||||
/obj/structure/window/plasmabasic
|
||||
name = "plasma window"
|
||||
desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through. Lacks protection from radiation."
|
||||
desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon_state = "plasmawindow"
|
||||
glass_decal = /obj/effect/decal/cleanable/glass/plasma
|
||||
shardtype = /obj/item/shard/plasma
|
||||
@@ -640,12 +647,14 @@
|
||||
max_integrity = 150
|
||||
explosion_block = 1
|
||||
armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100)
|
||||
rad_insulation = RAD_NO_INSULATION
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_WINDOW
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_conversion_amount = 2
|
||||
|
||||
/obj/structure/window/plasmareinforced
|
||||
name = "reinforced plasma window"
|
||||
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof. Lacks protection from radiation."
|
||||
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon_state = "plasmarwindow"
|
||||
glass_decal = /obj/effect/decal/cleanable/glass/plasma
|
||||
shardtype = /obj/item/shard/plasma
|
||||
@@ -655,10 +664,31 @@
|
||||
max_integrity = 500
|
||||
explosion_block = 2
|
||||
armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100)
|
||||
rad_insulation = RAD_NO_INSULATION
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_WINDOW
|
||||
damage_deflection = 21
|
||||
env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_conversion_amount = 1.5
|
||||
|
||||
/obj/structure/window/plastitanium
|
||||
name = "plastitanium window"
|
||||
desc = "An evil looking window of plasma and titanium. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon_state = "plastitaniumwindow"
|
||||
glass_decal = /obj/effect/decal/cleanable/glass/plastitanium
|
||||
shardtype = /obj/item/shard/plasma
|
||||
glass_type = /obj/item/stack/sheet/plastitaniumglass
|
||||
reinf = TRUE
|
||||
heat_resistance = 32000
|
||||
max_integrity = 600
|
||||
explosion_block = 2
|
||||
armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100)
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_WINDOW
|
||||
damage_deflection = 21
|
||||
env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_conversion_amount = 2.25
|
||||
|
||||
/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
return
|
||||
@@ -683,7 +713,7 @@
|
||||
|
||||
/obj/structure/window/full/plasmabasic
|
||||
name = "plasma window"
|
||||
desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through. Has very light protection from radiation."
|
||||
desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon = 'icons/obj/smooth_structures/windows/plasma_window.dmi'
|
||||
icon_state = "plasma_window-0"
|
||||
base_icon_state = "plasma_window"
|
||||
@@ -697,10 +727,13 @@
|
||||
edge_overlay_file = 'icons/obj/smooth_structures/windows/window_edges.dmi'
|
||||
env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_FULL_WINDOW
|
||||
rad_conversion_amount = 2.6
|
||||
|
||||
/obj/structure/window/full/plasmareinforced
|
||||
name = "reinforced plasma window"
|
||||
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof. Offers superior protection from radiation."
|
||||
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon = 'icons/obj/smooth_structures/windows/rplasma_window.dmi'
|
||||
icon_state = "rplasma_window-0"
|
||||
base_icon_state = "rplasma_window"
|
||||
@@ -712,10 +745,12 @@
|
||||
max_integrity = 1000
|
||||
explosion_block = 2
|
||||
armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100)
|
||||
rad_insulation = RAD_HEAVY_INSULATION
|
||||
edge_overlay_file = 'icons/obj/smooth_structures/windows/reinforced_window_edges.dmi'
|
||||
env_smash_level = ENVIRONMENT_SMASH_RWALLS // these ones are insanely tough
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_FULL_WINDOW
|
||||
rad_conversion_amount = 2.2
|
||||
|
||||
/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
return
|
||||
@@ -730,7 +765,7 @@
|
||||
reinf = TRUE
|
||||
heat_resistance = 1600
|
||||
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 25, RAD = 100, FIRE = 80, ACID = 100)
|
||||
rad_insulation = RAD_HEAVY_INSULATION
|
||||
rad_insulation_beta = RAD_BETA_BLOCKER
|
||||
explosion_block = 1
|
||||
glass_type = /obj/item/stack/sheet/rglass
|
||||
edge_overlay_file = 'icons/obj/smooth_structures/windows/reinforced_window_edges.dmi'
|
||||
@@ -775,7 +810,7 @@
|
||||
|
||||
/obj/structure/window/full/plastitanium
|
||||
name = "plastitanium window"
|
||||
desc = "An evil looking window of plasma and titanium."
|
||||
desc = "An evil looking window of plasma and titanium. When hit with Gamma particles it will become charged and start emitting Beta particles"
|
||||
icon = 'icons/obj/smooth_structures/windows/plastitanium_window.dmi'
|
||||
icon_state = "plastitanium_window-0"
|
||||
base_icon_state = "plastitanium_window"
|
||||
@@ -783,13 +818,16 @@
|
||||
reinf = TRUE
|
||||
heat_resistance = 32000
|
||||
armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100)
|
||||
rad_insulation = RAD_HEAVY_INSULATION
|
||||
rad_insulation_beta = RAD
|
||||
explosion_block = 3
|
||||
glass_type = /obj/item/stack/sheet/plastitaniumglass
|
||||
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
|
||||
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
|
||||
env_smash_level = ENVIRONMENT_SMASH_RWALLS //used in shuttles, same reason as above
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_insulation_beta = RAD_NO_INSULATION
|
||||
rad_insulation_gamma = RAD_GAMMA_FULL_WINDOW
|
||||
rad_conversion_amount = 3
|
||||
|
||||
/obj/structure/window/reinforced/clockwork
|
||||
name = "brass window"
|
||||
|
||||
Reference in New Issue
Block a user