diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 83f54583a5c..aa7050804dd 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -217,7 +217,7 @@ alert_sound_to_playing(sound_to_play, players = players) for(var/mob/target in players) - if(isnewplayer(target) || !target.can_hear()) + if(isnewplayer(target) || !HAS_TRAIT(target, TRAIT_DEAF)) continue to_chat(target, announcement) diff --git a/modular_skyrat/modules/armaments/code/armament_component.dm b/modular_skyrat/modules/armaments/code/armament_component.dm index e9b544baf44..2d6a3397a9c 100644 --- a/modular_skyrat/modules/armaments/code/armament_component.dm +++ b/modular_skyrat/modules/armaments/code/armament_component.dm @@ -240,7 +240,7 @@ //if they're strange and have a hacky ID card as an animal else if(isanimal(user)) - var/mob/living/simple_animal/animal = user + var/mob/living/basic/animal = user if(check_access_obj(animal.access_card)) return TRUE diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm b/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm index eb26bf5b9bc..5664c20847d 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm @@ -152,3 +152,6 @@ grind_results = list(/datum/reagent/plantnutriment/eznutriment = 3, /datum/reagent/plantnutriment/left4zednutriment = 3, /datum/reagent/plantnutriment/robustharvestnutriment = 3) singular_name = "fertilizer" merge_type = /obj/item/stack/worm_fertilizer + +/obj/item/stack/worm_fertilizer/grind_results() + return list(/datum/reagent/plantnutriment/eznutriment = 3, /datum/reagent/plantnutriment/left4zednutriment = 3, /datum/reagent/plantnutriment/robustharvestnutriment = 3) diff --git a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm index d53e9c3bfea..8f2c4adf889 100644 --- a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm @@ -129,7 +129,7 @@ flash_color(select_mob, flash_color = "#FF0000", flash_time = 3 SECONDS) var/megafauna_choice = pick( - /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner, + /mob/living/basic/boss/blood_drunk_miner, /mob/living/simple_animal/hostile/megafauna/dragon, /mob/living/simple_animal/hostile/megafauna/hierophant, ) diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm index 756ca2afcfb..30dfaec8501 100644 --- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm +++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm @@ -41,9 +41,11 @@ icon_state = "bananaspider_peel" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) foodtypes = GORE | MEAT | RAW - grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5) juice_typepath = /datum/reagent/consumable/banana +/obj/item/food/deadbanana_spider/grind_results() + return list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5) + /obj/item/food/deadbanana_spider/Initialize(mapload) . = ..() diff --git a/modular_skyrat/modules/black_mesa/code/turfs.dm b/modular_skyrat/modules/black_mesa/code/turfs.dm index 9192378f5b4..3fc6c367a06 100644 --- a/modular_skyrat/modules/black_mesa/code/turfs.dm +++ b/modular_skyrat/modules/black_mesa/code/turfs.dm @@ -102,9 +102,8 @@ unlucky_mob.Stun(1.5 SECONDS) unlucky_mob.Knockdown(10 SECONDS) unlucky_mob.adjust_fire_loss(15) - var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread - s.set_up(5, 1, unlucky_mob.loc) - s.start() + var/datum/effect_system/basic/lightning_spread/lightning = new(unlucky_mob.loc, 5, TRUE) + lightning.start() unlucky_mob.visible_message(span_danger("[unlucky_mob.name] is shocked by [src]!"), \ span_userdanger("You feel a powerful shock course through your body!"), \ span_hear("You hear a heavy electrical crack!")) diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm index 2388aaa89b2..8e6cf21bb07 100644 --- a/modular_skyrat/modules/bongs/code/bong.dm +++ b/modular_skyrat/modules/bongs/code/bong.dm @@ -128,15 +128,11 @@ name = "lit [name]" if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) * 0.4, 1), get_turf(src), 0, 0) - explosion.start() + reagent_explode(datum/reagents/reagents) qdel(src) return if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) * 0.2, 1), get_turf(src), 0, 0) - explosion.start() + reagent_explode(datum/reagents/reagents) qdel(src) return diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm index 150170727f7..2b444389f83 100644 --- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm +++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm @@ -280,9 +280,7 @@ var/prev_lockcharge = borg.lockcharge borg.SetLockdown(TRUE) borg.set_anchored(TRUE) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(1, holder = borg, location = borg.loc) - smoke.start() + do_smoke(4, src, loc, smoke_type = /datum/effect_system/fluid_spread/smoke) sleep(0.2 SECONDS) for(var/i in 1 to 4) playsound(borg, pick( diff --git a/modular_skyrat/modules/bsa_overhaul/code/bsa_computer.dm b/modular_skyrat/modules/bsa_overhaul/code/bsa_computer.dm index 688377c551f..17bfee4efa0 100644 --- a/modular_skyrat/modules/bsa_overhaul/code/bsa_computer.dm +++ b/modular_skyrat/modules/bsa_overhaul/code/bsa_computer.dm @@ -180,9 +180,7 @@ if(notice) return null //Totally nanite construction system not an immersion breaking spawning - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(4, location = get_turf(centerpiece)) - smoke.start() + do_smoke(4, src, loc, smoke_type = /datum/effect_system/fluid_spread/smoke/bad) var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece), centerpiece.get_cannon_direction()) cannon.control_computer = src if(centerpiece.front_piece) diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 2bd1acabf32..e13ccfd9834 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -492,8 +492,7 @@ /obj/projectile/energy/medical/utility/body_teleporter/proc/teleport_effect(location) var/datum/effect_system/basic/spark_spread/quantum/sparks = new /datum/effect_system/basic/spark_spread/quantum //uses the teleport effect from quantum pads - sparks.set_up(5, 1, get_turf(location)) - sparks.start() + do_sparks(5, 1, get_turf(location)) //Objects Used by medicells. /obj/item/clothing/suit/toggle/labcoat/hospitalgown/hardlight diff --git a/modular_skyrat/modules/clock_cult/code/outpost_of_cogs.dm b/modular_skyrat/modules/clock_cult/code/outpost_of_cogs.dm index e2e603b82ef..028d13dbe6c 100644 --- a/modular_skyrat/modules/clock_cult/code/outpost_of_cogs.dm +++ b/modular_skyrat/modules/clock_cult/code/outpost_of_cogs.dm @@ -27,7 +27,7 @@ SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_OUTPOST_OF_COGS) for(var/mob/target as anything in GLOB.player_list) - if(!isnewplayer(target) && target.can_hear() && is_station_level(target.z)) + if(!isnewplayer(target) && !HAS_TRAIT(target, TRAIT_DEAF) && is_station_level(target.z)) to_chat(target, span_brass("You hear a distant, faint clanking of cogs...")) sleep(7 SECONDS) diff --git a/modular_skyrat/modules/clock_cult/code/structures/technologists_lectern.dm b/modular_skyrat/modules/clock_cult/code/structures/technologists_lectern.dm index e25e3400c01..73b490bf5fc 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/technologists_lectern.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/technologists_lectern.dm @@ -316,7 +316,7 @@ /// Send a message to everyone on the Z level with directions to the lectern /obj/structure/destructible/clockwork/gear_base/technologists_lectern/proc/send_message(initial_message = "You hear the echoing of cogs ", volume = 70) for(var/mob/living/living_mob as anything in GLOB.mob_living_list) - if((living_mob.z != z) || IS_CLOCK(living_mob) || !living_mob.can_hear()) + if((living_mob.z != z) || IS_CLOCK(living_mob) || !HAS_TRAIT(living_mob, TRAIT_DEAF)) continue @@ -418,9 +418,7 @@ var/turf/tile = get_step(src, direction) new /mob/living/basic/clockwork_marauder(tile) - var/datum/effect_system/fluid_spread/smoke/smoke_cloud = new - smoke_cloud.set_up(4, holder = src, location = src) - smoke_cloud.start() + do_smoke(4, holder = src, location = src) if(21 to 30) // Fuck up the power priority_announce("A fatal power outage has occurred. Please ensure that all on-board devices are connected to an appropriate power generator.") diff --git a/modular_skyrat/modules/cryosleep/code/admin.dm b/modular_skyrat/modules/cryosleep/code/admin.dm index d45a8d58b18..53ec1dd4e55 100644 --- a/modular_skyrat/modules/cryosleep/code/admin.dm +++ b/modular_skyrat/modules/cryosleep/code/admin.dm @@ -3,9 +3,6 @@ //effect playsound(loc, 'sound/effects/magic/Repulse.ogg', 100, 1) var/datum/effect_system/basic/spark_spread/quantum/sparks = new - sparks.set_up(10, 1, loc) - sparks.attach(loc) - sparks.start() //make a paper if need if(with_paper)