cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

makes bots/gunpowder use boldnotice, makes boldnotice an info message (#65415)

Browse Source 
* Improves bot explosion code, adds boldnotice to chat message group
This commit is contained in:
John Willard
2022-03-28 17:22:26 +02:00
committed by GitHub
parent 92364292ee
commit f18aa6b234
11 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+3 -2
View File
@@ -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 ..()
code/modules/mob/living/simple_animal/bot/bot.dm
+3 -1
View File
@@ -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)
. = ..()
code/modules/mob/living/simple_animal/bot/cleanbot.dm
+1 -7
View File
@@ -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)
code/modules/mob/living/simple_animal/bot/firebot.dm
+1 -6
View File
@@ -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
code/modules/mob/living/simple_animal/bot/floorbot.dm
+1 -5
View File
@@ -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))
code/modules/mob/living/simple_animal/bot/hygienebot.dm
+1 -4
View File
@@ -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
code/modules/mob/living/simple_animal/bot/medbot.dm
+1 -5
View File
@@ -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))
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -4
View File
@@ -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
code/modules/mob/living/simple_animal/bot/secbot.dm
+2 -5
View File
@@ -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)
..()