diff --git a/code/controllers/subsystems/hallucinations.dm b/code/controllers/subsystems/hallucinations.dm index 659c241ce1c..04667cc8689 100644 --- a/code/controllers/subsystems/hallucinations.dm +++ b/code/controllers/subsystems/hallucinations.dm @@ -15,10 +15,6 @@ SUBSYSTEM_DEF(hallucinations) var/list/adpi_jobs = list() var/list/adpi_next_message = list() var/tmp/list/current_adpi_targets = list() - var/static/list/adpi_sounds = list( - 'sound/ambience/ghostly/ghostly1.ogg', - 'sound/ambience/ghostly/ghostly2.ogg' - ) var/static/list/adpi_department_files = list( DEPARTMENT_COMMAND = "adpi_dept_command.txt", DEPARTMENT_ENGINEERING = "adpi_dept_engineering.txt", @@ -328,7 +324,7 @@ SUBSYSTEM_DEF(hallucinations) return TRUE /datum/controller/subsystem/hallucinations/proc/send_admin_adpi_message(var/mob/living/target, var/custom_message = null) - if(!target || !target.client || !target.mind || target.stat == DEAD || !target.is_psi_blocked(null, FALSE)) + if(!target || !target.client || !target.mind || target.stat == DEAD || is_adpi_excluded(target) || is_adpi_blocked(target)) return FALSE ensure_adpi_lists_loaded() @@ -353,9 +349,6 @@ SUBSYSTEM_DEF(hallucinations) target.play_screen_text("[message]", /atom/movable/screen/text/screen_text/adpi_message, COLOR_PURPLE) to_chat(target, SPAN_CULT(FONT_LARGE("[message]"))) - if(prob(33)) - sound_to(target, pick(adpi_sounds)) - if(isskrell(target)) var/mob/living/carbon/human/H = target apply_skrell_adpi_pain(H) diff --git a/code/modules/background/space_sectors/void.dm b/code/modules/background/space_sectors/void.dm index 999d3236260..0e030a41788 100644 --- a/code/modules/background/space_sectors/void.dm +++ b/code/modules/background/space_sectors/void.dm @@ -45,20 +45,20 @@ starlight_range = 0 overmap_hazards_multiplier = 1.3 cargo_price_coef = list( - "nanotrasen" = 6.0, - "orion" = 6.0, - "hephaestus" = 6.0, - "zeng_hu" = 6.0, - "eckharts" = 6.0, - "getmore" = 6.0, - "arizi" = 6.0, - "blam" = 6.0, - "iac" = 6.0, - "zharkov" = 6.0, - "virgo" = 6.0, - "bishop" = 6.0, - "xion" = 6.0, - "zavodskoi" = 6.0, + "nanotrasen" = 2.5, + "orion" = 2.5, + "hephaestus" = 2.5, + "zeng_hu" = 2.5, + "eckharts" = 2.5, + "getmore" = 2.5, + "arizi" = 2.5, + "blam" = 2.5, + "iac" = 2.5, + "zharkov" = 2.5, + "virgo" = 2.5, + "bishop" = 2.5, + "xion" = 2.5, + "zavodskoi" = 2.5, ) lobby_tracks = list( @@ -72,7 +72,6 @@ sector_lobby_transitions = 0 sector_hud_menu = 'icons/misc/hudmenu/lemurian_hud.dmi' hivenet_echoes = FALSE - ghostroles_enabled = FALSE away_sites_enabled = FALSE ccia_link = FALSE diff --git a/code/modules/events/gravity_anomaly.dm b/code/modules/events/gravity_anomaly.dm index e992b1a9308..44b461c6a6d 100644 --- a/code/modules/events/gravity_anomaly.dm +++ b/code/modules/events/gravity_anomaly.dm @@ -1,7 +1,7 @@ /datum/event/gravity_anomaly announceWhen = 0 - startWhen = 90 SECONDS - endWhen = 60 SECONDS // Actually gets set in setup() + startWhen = 30 + endWhen = 60 // Actually gets set in setup() ic_name = "a gravitational anomaly" var/list/valid_victims has_skybox_image = TRUE @@ -35,7 +35,7 @@ ) /datum/event/gravity_anomaly/setup() - endWhen = rand(5 MINUTES, 25 MINUTES) + endWhen = rand(240, 720) /datum/event/gravity_anomaly/announce() command_announcement.Announce( @@ -102,7 +102,7 @@ return FALSE /datum/event/gravity_anomaly/proc/pick_victim_disturbance() - if(activeFor >= next_gravity_surge && prob(50)) + if(activeFor >= next_gravity_surge && prob(67)) schedule_next_gravity_surge() if(prob(10)) return "surge_hilarious" @@ -119,7 +119,7 @@ return null /datum/event/gravity_anomaly/proc/schedule_next_gravity_surge() - next_gravity_surge = activeFor + rand(20, 60) + next_gravity_surge = activeFor + rand(2, 90) /datum/event/gravity_anomaly/proc/get_current_victims() var/list/current_victims = list() @@ -180,7 +180,7 @@ else if(prob(20)) to_chat(victim, SPAN_WARNING(pick(nausea_mild_organic))) - if(prob(10)) + if(prob(5)) victim.vomit() /datum/event/gravity_anomaly/proc/apply_nausea_strong(var/mob/living/carbon/human/victim) @@ -191,7 +191,8 @@ to_chat(victim, SPAN_MACHINE_WARNING(pick(nausea_strong_ipc))) else to_chat(victim, SPAN_WARNING(pick(nausea_strong_organic))) - victim.vomit() + if(prob(25)) + victim.vomit() /datum/event/gravity_anomaly/proc/apply_surge_default(var/mob/living/carbon/human/victim) victim.dizziness += rand(10, 20) diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm index 74671f05ae6..2548f020a25 100644 --- a/code/modules/maptext_alerts/screen_alerts.dm +++ b/code/modules/maptext_alerts/screen_alerts.dm @@ -88,6 +88,26 @@ style_open = "" style_close = "" +/atom/movable/screen/text/screen_text/adpi_message/psiren_spam + screen_loc = "LEFT,TOP-7" + + play_delay = 0.1 + letters_per_update = 1 + fade_out_delay = 1 SECONDS + + style_open = "" + style_close = "" + + +/atom/movable/screen/text/screen_text/adpi_message/psiren_spam/Initialize() + var/random_shift = rand(1,4) + if(prob(50)) + random_shift *= -1 + // Christ on sale. I'm sorry, but this DOES work... + screen_loc = "LEFT[random_shift > 0 ? "+" : ""][random_shift]:[random_shift * 2],TOP-[7 + random_shift]:[random_shift * 2]" + ..() + return INITIALIZE_HINT_NORMAL + ///proc for actually playing this screen_text on a mob. /atom/movable/screen/text/screen_text/proc/play_to_client() player?.add_to_screen(src) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 002aa468e90..d9c4d994fc9 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -487,14 +487,16 @@ GLOBAL_LIST_INIT(organ_rel_size, list( /proc/shake_camera(mob/M, duration, strength=1, drift = FALSE) if(!M || !M.client || duration < 1) return + // This variable exists simply to reduce total strength of screenshake; in the future, it should be hooked to a client preference setting (standard/reduced screenshake for motion-sickness) + var/reduction_modifier = 2/3 var/drift_mode = (drift == TRUE) var/client/C = M.client var/oldx = C.pixel_x var/oldy = C.pixel_y - var/max_x = strength*ICON_SIZE_X - var/max_y = strength*ICON_SIZE_Y - var/min_x = -(strength*ICON_SIZE_X) - var/min_y = -(strength*ICON_SIZE_Y) + var/max_x = strength*ICON_SIZE_X*(reduction_modifier) + var/max_y = strength*ICON_SIZE_Y*(reduction_modifier) + var/min_x = -(strength*ICON_SIZE_X)*(reduction_modifier) + var/min_y = -(strength*ICON_SIZE_Y)*(reduction_modifier) //How much time to allot for each pixel moved var/time_scalar = (1 / ICON_SIZE_ALL) * TILES_PER_SECOND diff --git a/html/changelogs/Bat-SeaHotfixes.yml b/html/changelogs/Bat-SeaHotfixes.yml new file mode 100644 index 00000000000..8c85a41d351 --- /dev/null +++ b/html/changelogs/Bat-SeaHotfixes.yml @@ -0,0 +1,62 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophrenoboocosmomachia + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds some additional grates to the Horizon's D2 Medical for traction in zero-g." + - rscdel: "Removes ADPI sound effects." + - bugfix: "Fixes inflated Gravity Anomaly timing values." + - bugfix: "Fixes ADPI line retrieval." + - qol: "Reduces screenshake strength globally by 33%." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index d9f99f5e61e..3b21f5ab0d9 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -36385,10 +36385,10 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 8 +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/horizon/medical/icu) "eGB" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -40618,7 +40618,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" + }, +/turf/simulated/floor/plating, /area/horizon/medical/gen_treatment) "fkw" = ( /obj/effect/decal/cleanable/dirt, @@ -62633,7 +62636,10 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/white, +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" + }, +/turf/simulated/floor/plating, /area/horizon/medical/gen_treatment) "ieE" = ( /obj/structure/machinery/hologram/holopad, @@ -80889,7 +80895,6 @@ /turf/unsimulated/floor, /area/centcom/bar) "kxK" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/curtain/open/medical, /obj/structure/machinery/door/firedoor{ req_one_access = list(24,11,67,73); @@ -110240,10 +110245,12 @@ }, /area/antag/ninja) "oqq" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/machinery/door/firedoor{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" + }, /turf/simulated/floor/plating, /area/horizon/medical/hallway) "oqt" = ( @@ -122456,7 +122463,8 @@ icon_state = "0-2" }, /obj/structure/machinery/power/apc/high/north, -/turf/simulated/floor/tiled, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/horizon/medical/gen_treatment) "pVS" = ( /obj/structure/table/reinforced/steel, @@ -158209,7 +158217,6 @@ /turf/simulated/floor/tiled, /area/horizon/command/bridge/upperdeck) "uCB" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/curtain/open/medical, /obj/structure/machinery/light_switch{ pixel_y = -19 @@ -158432,7 +158439,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" + }, +/turf/simulated/floor/plating, /area/horizon/medical/icu) "uDI" = ( /obj/effect/decal/fake_object/light_source{ @@ -179803,7 +179813,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/structure/lattice/catwalk/indoor/grate{ + color = "#FFFFFF" + }, +/turf/simulated/floor/plating, /area/horizon/medical/icu) "xsc" = ( /obj/effect/floor_decal/corner/grey/diagonal{ @@ -181058,7 +181071,6 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/engineering/atmos/propulsion/starboard) "xzM" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/curtain/open/medical, /obj/structure/cable/green{ icon_state = "4-8"