Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "MILLA phase 2 (#27659)" #1733

Closed
wants to merge 2 commits into from
Closed

Revert "MILLA phase 2 (#27659)" #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe44de
Revert "MILLA phase 2 (#27659)"
m-dzianishchyts Jan 5, 2025
0b80e06
Build Rust library
paradisess13[bot] Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions _maps/map_files/shuttles/emergency_shadow.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"ge" = (
/obj/structure/table/glass/reinforced/plastitanium,
Expand Down Expand Up @@ -352,8 +351,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"pi" = (
/obj/effect/turf_decal/stripes/white/line{
Expand Down Expand Up @@ -524,6 +522,9 @@
},
/turf/simulated/floor/pod/dark,
/area/shuttle/escape)
"wG" = (
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"xy" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4
Expand Down Expand Up @@ -564,8 +565,7 @@
},
/area/shuttle/escape)
"zj" = (
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/o2,
/area/shuttle/escape)
"zs" = (
/obj/structure/reagent_dispensers/fueltank,
Expand Down Expand Up @@ -639,8 +639,7 @@
/area/template_noop)
"CD" = (
/obj/machinery/igniter/shadow,
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"CK" = (
/obj/structure/shuttle/engine/propulsion/burst{
Expand Down Expand Up @@ -681,8 +680,7 @@
/area/shuttle/escape)
"DY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"DZ" = (
/obj/effect/turf_decal/stripes/red/corner{
Expand Down Expand Up @@ -741,8 +739,7 @@
dir = 4;
invisibility = 99
},
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"Gx" = (
/obj/structure/extinguisher_cabinet{
Expand Down Expand Up @@ -1154,8 +1151,7 @@
dir = 9
},
/obj/machinery/atmospherics/meter,
/obj/structure/plasmafire_generator/shadow,
/turf/simulated/floor/engine/airless,
/turf/simulated/floor/engine/plasma,
/area/shuttle/escape)
"Xp" = (
/obj/structure/marker_beacon/dock_marker/collision,
Expand Down Expand Up @@ -1332,7 +1328,7 @@ Ah
Sn
uu
fV
zj
wG
Gs
cX
wF
Expand Down
6 changes: 0 additions & 6 deletions code/__DEFINES/atmospherics_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,6 @@
/// Cold environment: Normal atmosphere, -93 C.
#define ENVIRONMENT_COLD "cold"

/// How far away should we load the pressure HUD data from MILLA?
#define PRESSURE_HUD_LOAD_RADIUS 15

/// How far away should we send the pressure HUD to the player?
#define PRESSURE_HUD_RADIUS 12

// Vent pump modes
/// Don't go over the external pressure
#define ONLY_CHECK_EXT_PRESSURE 1
Expand Down
36 changes: 17 additions & 19 deletions code/__DEFINES/hud.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#define DIAG_AIRLOCK_HUD "22" // Airlock shock overlay
#define GLAND_HUD "23"//Gland indicators for abductors
#define JANI_HUD "24" // Sign overlay over cleanable decals
#define PRESSURE_HUD "25" // Pressure coloring for tiles

//by default everything in the hud_list of an atom is an image
//a value in hud_list with one of these will change that behavior
Expand All @@ -43,26 +42,25 @@
#define DATA_HUD_DIAGNOSTIC_ADVANCED 6
#define DATA_HUD_HYDROPONIC 7
#define DATA_HUD_JANITOR 8
#define DATA_HUD_PRESSURE 9
//antag HUD defines
#define ANTAG_HUD_CULT 10
#define ANTAG_HUD_REV 11
#define ANTAG_HUD_OPS 12
#define ANTAG_HUD_WIZ 13
#define ANTAG_HUD_SHADOW 14
#define ANTAG_HUD_TRAITOR 15
#define ANTAG_HUD_NINJA 16
#define ANTAG_HUD_CHANGELING 17
#define ANTAG_HUD_VAMPIRE 18
#define ANTAG_HUD_ABDUCTOR 19
#define DATA_HUD_ABDUCTOR 20
#define ANTAG_HUD_EVENTMISC 21
#define ANTAG_HUD_BLOB 22
#define ANTAG_HUD_ZOMBIE 23
#define ANTAG_HUD_MIND_FLAYER 24
#define ANTAG_HUD_CULT 9
#define ANTAG_HUD_REV 10
#define ANTAG_HUD_OPS 11
#define ANTAG_HUD_WIZ 12
#define ANTAG_HUD_SHADOW 13
#define ANTAG_HUD_TRAITOR 14
#define ANTAG_HUD_NINJA 15
#define ANTAG_HUD_CHANGELING 16
#define ANTAG_HUD_VAMPIRE 17
#define ANTAG_HUD_ABDUCTOR 18
#define DATA_HUD_ABDUCTOR 19
#define ANTAG_HUD_EVENTMISC 20
#define ANTAG_HUD_BLOB 21
#define ANTAG_HUD_ZOMBIE 22
#define ANTAG_HUD_MIND_FLAYER 23
// SS220 EDIT - START
#define ANTAG_HUD_BLOOD_BROTHER 25
#define ANTAG_HUD_VOX_RAIDER 26
#define ANTAG_HUD_BLOOD_BROTHER 24
#define ANTAG_HUD_VOX_RAIDER 25
// SS220 EDIT - END

// Notification action types
Expand Down
9 changes: 4 additions & 5 deletions code/__DEFINES/machines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,15 @@
/**
* Air alarm modes
*/
#define AALARM_MODE_FILTERING 1
#define AALARM_MODE_DRAUGHT 2 //makes draught
#define AALARM_MODE_SCRUBBING 1
#define AALARM_MODE_VENTING 2 //makes draught
#define AALARM_MODE_PANIC 3 //like siphon, but stronger (enables widenet)
#define AALARM_MODE_CYCLE 4 //sucks off all air, then refill and swithes to scrubbing
#define AALARM_MODE_REPLACEMENT 4 //sucks off all air, then refill and swithes to scrubbing
#define AALARM_MODE_SIPHON 5 //Scrubbers suck air
#define AALARM_MODE_CONTAMINATED 6 //Turns on all filtering and widenet scrubbing.
#define AALARM_MODE_REFILL 7 //just like normal, but disables low pressure check until normalized, then switches to normal
#define AALARM_MODE_REFILL 7 //just like normal, but with triple the air output
#define AALARM_MODE_OFF 8
#define AALARM_MODE_FLOOD 9 //Emagged mode; turns off scrubbers and pressure checks on vents
#define AALARM_MODE_CUSTOM 10

#define NUKE_STATUS_INTACT 0
#define NUKE_CORE_MISSING 1
Expand Down
37 changes: 10 additions & 27 deletions code/__DEFINES/rust.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,14 @@
// This needs to go BELOW the above define, otherwise the BYOND compiler can make the above immediate call disappear
#undef RUSTLIBS_SUFFIX

/// Exists by default in 516, but needs to be defined for 515 or byondapi-rs doesn't like it.
/proc/byondapi_stack_trace(err)
CRASH(err)

/proc/milla_init_z(z)
return RUSTLIB_CALL(milla_initialize, z)

/proc/set_tile_atmos(turf/T, airtight_north, airtight_east, airtight_south, airtight_west, atmos_mode, environment_id, oxygen, carbon_dioxide, nitrogen, toxins, sleeping_agent, agent_b, temperature, innate_heat_capacity, hotspot_temperature, hotspot_volume)
return RUSTLIB_CALL(milla_set_tile, T, airtight_north, airtight_east, airtight_south, airtight_west, atmos_mode, environment_id, oxygen, carbon_dioxide, nitrogen, toxins, sleeping_agent, agent_b, temperature, innate_heat_capacity, hotspot_temperature, hotspot_volume)
/proc/is_milla_synchronous(tick)
return RUSTLIB_CALL(milla_is_synchronous, tick)

/proc/set_tile_atmos(turf/T, airtight_north, airtight_east, airtight_south, airtight_west, atmos_mode, environment_id, oxygen, carbon_dioxide, nitrogen, toxins, sleeping_agent, agent_b, temperature, innate_heat_capacity)
return RUSTLIB_CALL(milla_set_tile, T, airtight_north, airtight_east, airtight_south, airtight_west, atmos_mode, environment_id, oxygen, carbon_dioxide, nitrogen, toxins, sleeping_agent, agent_b, temperature, innate_heat_capacity)

/proc/get_tile_atmos(turf/T, list/L)
return RUSTLIB_CALL(milla_get_tile, T, L)
Expand All @@ -75,9 +74,6 @@
/proc/get_interesting_atmos_tiles()
return RUSTLIB_CALL(milla_get_interesting_tiles)

/proc/get_tracked_pressure_tiles()
return RUSTLIB_CALL(milla_get_tracked_pressure_tiles)

/proc/reduce_superconductivity(turf/T, list/superconductivity)
var/north = superconductivity[1]
var/east = superconductivity[2]
Expand All @@ -97,14 +93,6 @@

return RUSTLIB_CALL(milla_set_tile_airtight, T, north, east, south, west)

/proc/create_hotspot(turf/T, hotspot_temperature, hotspot_volume)
return RUSTLIB_CALL(milla_create_hotspot, T, hotspot_temperature, hotspot_volume)

/proc/track_pressure_tiles(atom/A, radius)
var/turf/T = get_turf(A)
if(istype(T))
return RUSTLIB_CALL(milla_track_pressure_tiles, T, radius)

/proc/get_random_interesting_tile()
return RUSTLIB_CALL(milla_get_random_interesting_tile)

Expand Down Expand Up @@ -134,20 +122,15 @@
#define MILLA_INDEX_SUPERCONDUCTIVITY_WEST 13
#define MILLA_INDEX_INNATE_HEAT_CAPACITY 14
#define MILLA_INDEX_TEMPERATURE 15
#define MILLA_INDEX_HOTSPOT_TEMPERATURE 16
#define MILLA_INDEX_HOTSPOT_VOLUME 17
#define MILLA_INDEX_WIND_X 18
#define MILLA_INDEX_WIND_Y 19
#define MILLA_INDEX_FUEL_BURNT 20

/// The number of values per tile.
#define MILLA_TILE_SIZE MILLA_INDEX_FUEL_BURNT
#define MILLA_TILE_SIZE MILLA_INDEX_TEMPERATURE

// These are only for InterestingTiles.
#define MILLA_INDEX_TURF 21
#define MILLA_INDEX_INTERESTING_REASONS 22
#define MILLA_INDEX_AIRFLOW_X 23
#define MILLA_INDEX_AIRFLOW_Y 24
#define MILLA_INDEX_TURF 16
#define MILLA_INDEX_INTERESTING_REASONS 17
#define MILLA_INDEX_AIRFLOW_X 18
#define MILLA_INDEX_AIRFLOW_Y 19

/// The number of values per interesting tile.
#define MILLA_INTERESTING_TILE_SIZE MILLA_INDEX_AIRFLOW_Y
Expand Down
3 changes: 0 additions & 3 deletions code/__DEFINES/status_effects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@

#define STATUS_EFFECT_REVERSED_HIGH_PRIESTESS /datum/status_effect/reversed_high_priestess //Bubblegum will chase the person hit by the effect, grabbing people at random. This can and WILL include the caster.

#define STATUS_EFFECT_UNBALANCED /datum/status_effect/unbalanced // Prevents you from automatically grabbing walls to stop moving in space.

#define STATUS_EFFECT_C_FOAMED /datum/status_effect/c_foamed

#define STATUS_EFFECT_TEMPORAL_SLASH /datum/status_effect/temporal_slash
Expand Down Expand Up @@ -167,7 +165,6 @@
#define STATUS_EFFECT_IMMOBILIZED /datum/status_effect/incapacitating/immobilized
#define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping
#define STATUS_EFFECT_SLOWED /datum/status_effect/incapacitating/slowed
#define STATUS_EFFECT_DIRECTIONAL_SLOW /datum/status_effect/incapacitating/directional_slow
#define STATUS_EFFECT_PARALYZED /datum/status_effect/incapacitating/paralyzed
#define STATUS_EFFECT_FLOORED /datum/status_effect/incapacitating/floored
#define STATUS_EFFECT_ARMBAR /datum/status_effect/judo_armbar
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/wires_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define WIRE_BOLT_LIGHT "Bolt Lights"

// Air alarm
#define WIRE_SIPHON "Siphon"
#define WIRE_SYPHON "Siphon"
#define WIRE_AALARM "Atmospherics Alarm"

// Camera
Expand Down
1 change: 0 additions & 1 deletion code/__HELPERS/trait_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_DWARF "dwarf"
#define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent
#define TRAIT_MESON_VISION "meson_vision"
#define TRAIT_PRESSURE_VISION "pressure_vision"
#define TRAIT_FLASH_PROTECTION "flash_protection"
#define TRAIT_NIGHT_VISION "night_vision"
#define TRAIT_EMOTE_MUTE "emote_mute"
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/type2type.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
/proc/heat2color_g(temp)
temp /= 100
if(temp <= 66)
. = max(0, min(255, 99.4708025861 * log(max(temp, 1)) - 161.1195681661))
. = max(0, min(255, 99.4708025861 * log(temp) - 161.1195681661))
else
. = max(0, min(255, 288.1221695283 * ((temp - 60) ** -0.0755148492)))

Expand All @@ -271,7 +271,7 @@
if(temp <= 16)
. = 0
else
. = max(0, min(255, 138.5177312231 * log(max(temp - 10, 1)) - 305.0447927307))
. = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))

//Argument: Give this a space-separated string consisting of 6 numbers. Returns null if you don't
/proc/text2matrix(matrixtext)
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
"TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE,
"TRAIT_MESON_VISION" = TRAIT_MESON_VISION,
"TRAIT_PRESSURE_VISION" = TRAIT_PRESSURE_VISION,
"TRAIT_FLASH_PROTECTION" = TRAIT_FLASH_PROTECTION,
"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
"TRAIT_DRASK_SUPERCOOL" = TRAIT_DRASK_SUPERCOOL,
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/click_override.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
if(get_dist(T, target_turf) > P.shock_range)
to_chat(user, "<span class='warning'>The target is too far away.</span>")
return FALSE
target_turf.hotspot_expose(2000, 1)
target_turf.hotspot_expose(2000, 400)
playsound(user.loc, 'sound/effects/eleczap.ogg', 40, 1)

var/atom/beam_from = user
Expand Down
Loading
Loading