From f18aa6b2340603277fe53e448a1691a2cd72deaa Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Mon, 28 Mar 2022 11:22:26 -0400 Subject: [PATCH] makes bots/gunpowder use boldnotice, makes boldnotice an info message (#65415) * Improves bot explosion code, adds boldnotice to chat message group --- code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm | 5 +++-- code/modules/mob/living/simple_animal/bot/bot.dm | 4 +++- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 8 +------- code/modules/mob/living/simple_animal/bot/firebot.dm | 7 +------ code/modules/mob/living/simple_animal/bot/floorbot.dm | 6 +----- code/modules/mob/living/simple_animal/bot/hygienebot.dm | 5 +---- code/modules/mob/living/simple_animal/bot/medbot.dm | 6 +----- code/modules/mob/living/simple_animal/bot/mulebot.dm | 5 +---- code/modules/mob/living/simple_animal/bot/secbot.dm | 7 ++----- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 2 +- tgui/packages/tgui-panel/chat/constants.js | 2 +- 11 files changed, 16 insertions(+), 41 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index eba10e502d2..e8314bead7e 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -130,8 +130,9 @@ continue /mob/living/simple_animal/bot/secbot/grievous/explode() - ..() var/atom/Tsec = drop_location() //Parent is dropping the weapon, so let's drop 3 more to make up for it. - for(var/IS = 0 to 3) + for(var/dropped_weapons = 0 to 3) drop_part(weapon, Tsec) + + return ..() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index bb74e2f9ae3..723c9cf0e2c 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -229,10 +229,12 @@ ..() /mob/living/simple_animal/bot/proc/explode() - qdel(src) + visible_message(span_boldnotice("[src] blows apart!")) + do_sparks(3, TRUE, src) var/atom/location_destroyed = drop_location() if(prob(50)) drop_part(robot_arm, location_destroyed) + qdel(src) /mob/living/simple_animal/bot/emag_act(mob/user, obj/item/card/emag/emag_card) . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 7df125a7e98..7d20e084021 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -359,16 +359,10 @@ ..() /mob/living/simple_animal/bot/cleanbot/explode() - bot_mode_flags &= ~BOT_MODE_ON - visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() - new /obj/item/reagent_containers/glass/bucket(Tsec) - new /obj/item/assembly/prox_sensor(Tsec) - - do_sparks(3, TRUE, src) - ..() + return ..() // Variables sent to TGUI /mob/living/simple_animal/bot/cleanbot/ui_data(mob/user) diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 59d81db7e9c..9ffc4680868 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -289,9 +289,6 @@ /mob/living/simple_animal/bot/firebot/explode() - bot_mode_flags &= ~BOT_MODE_ON - visible_message(span_boldannounce("[src] blows apart!")) - var/atom/Tsec = drop_location() new /obj/item/assembly/prox_sensor(Tsec) @@ -302,9 +299,7 @@ if(isopenturf(T)) var/turf/open/theturf = T theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) - - do_sparks(3, TRUE, src) - ..() + return ..() #undef SPEECH_INTERVAL #undef DETECTED_VOICE_INTERVAL diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 30844d3621a..ef2565f79d2 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -389,9 +389,7 @@ icon_state = "[toolbox_color]floorbot[get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" /mob/living/simple_animal/bot/floorbot/explode() - bot_mode_flags &= ~BOT_MODE_ON target = null - visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() drop_part(toolbox, Tsec) @@ -402,9 +400,7 @@ tilestack.forceMove(drop_location()) new /obj/item/stack/tile/iron/base(Tsec, 1) - - do_sparks(3, TRUE, src) - ..() + return ..() /mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/A, proximity_flag, list/modifiers) if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED)) diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index 802a1aa50ac..729f3002141 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -51,12 +51,9 @@ AddElement(/datum/element/connect_loc, loc_connections) /mob/living/simple_animal/bot/hygienebot/explode() - visible_message(span_boldannounce("[src] blows apart in a foamy explosion!")) - do_sparks(3, TRUE, src) - bot_mode_flags &= ~BOT_MODE_ON new /obj/effect/particle_effect/foam(loc) - ..() + return ..() /mob/living/simple_animal/bot/hygienebot/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 3a5414af339..c5b4049c126 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -567,8 +567,6 @@ tending = FALSE /mob/living/simple_animal/bot/medbot/explode() - bot_mode_flags &= ~BOT_MODE_ON - visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() drop_part(medkit_type, Tsec) @@ -577,9 +575,7 @@ if(bot_cover_flags & BOT_COVER_EMAGGED && prob(25)) playsound(src, 'sound/voice/medbot/insult.ogg', 50) - - do_sparks(3, TRUE, src) - ..() + return ..() /mob/living/simple_animal/bot/medbot/proc/declare(crit_patient) if(!COOLDOWN_FINISHED(src, last_patient_message)) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index fea6ffff4dc..1aaffbdafca 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -742,7 +742,6 @@ /mob/living/simple_animal/bot/mulebot/explode() - visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() new /obj/item/assembly/prox_sensor(Tsec) @@ -754,10 +753,8 @@ cell.update_appearance() cell = null - do_sparks(3, TRUE, src) - new /obj/effect/decal/cleanable/oil(loc) - ..() + return ..() /mob/living/simple_animal/bot/mulebot/remove_air(amount) //To prevent riders suffocating return loc ? loc.remove_air(amount) : null diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 6dcf329f8d3..69fe97a7b2a 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -97,7 +97,7 @@ new /obj/item/stock_parts/cell/potato(Tsec) var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/drinking_oil = new(Tsec) drinking_oil.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15) - ..() + return ..() /mob/living/simple_animal/bot/secbot/Initialize(mapload) . = ..() @@ -464,7 +464,6 @@ return FALSE /mob/living/simple_animal/bot/secbot/explode() - visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() switch(bot_type) if(ADVANCED_SEC_BOT) @@ -499,10 +498,8 @@ new /obj/item/assembly/prox_sensor(Tsec) drop_part(baton_type, Tsec) - do_sparks(3, TRUE, src) - new /obj/effect/decal/cleanable/oil(loc) - ..() + return ..() /mob/living/simple_animal/bot/secbot/attack_alien(mob/living/carbon/alien/user, list/modifiers) ..() diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 0c375886a69..08385f6e134 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -153,7 +153,7 @@ required_temp = 474 strengthdiv = 10 modifier = 5 - mix_message = "Sparks start flying around the gunpowder!" + mix_message = "Sparks start flying around the gunpowder!" /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index 67e4c6a563e..0333b648999 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -64,7 +64,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_INFO, name: 'Info', description: 'Non-urgent messages from the game and items', - selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce, .hear, .smallnotice, .holoparasite', + selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce, .hear, .smallnotice, .holoparasite, .boldnotice', }, { type: MESSAGE_TYPE_WARNING,