diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 980a749b90d..7111c39093d 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -23,6 +23,8 @@ var/trashtype = null //for disposable cuffs /obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user) + if(!istype(C)) + return if(user.disabilities & CLUMSY && prob(50)) user << "Uh... how do those things work?!" apply_cuffs(user,user) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 7654a396f22..8fc6d771551 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -128,9 +128,10 @@ "[user] has prodded you with [src]. Luckily it was off") return else - ..() if(status) baton_stun(L, user) + ..() + /obj/item/weapon/melee/baton/proc/baton_stun(mob/living/L, mob/user) diff --git a/code/game/sound.dm b/code/game/sound.dm index 14aace39369..4762a4c805f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -80,7 +80,7 @@ /client/proc/playtitlemusic() if(!ticker || !ticker.login_music) return - if(prefs.toggles & SOUND_LOBBY) + if(prefs && (prefs.toggles & SOUND_LOBBY)) src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS /proc/get_rand_frequency() diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm index 486c0003129..3d28d61dc14 100644 --- a/code/modules/admin/verbs/bluespacearty.dm +++ b/code/modules/admin/verbs/bluespacearty.dm @@ -21,6 +21,10 @@ if(prob(80)) T.break_tile_to_plating() else T.break_tile() + target << "You're hit by bluespace artillery!" + log_admin("[target.name] has been hit by Bluespace Artillery fired by [usr]") + message_admins("[target.name] has been hit by Bluespace Artillery fired by [usr]") + if(target.health <= 1) target.gib() else @@ -29,6 +33,3 @@ target.Weaken(20) target.stuttering = 20 - target << "You're hit by bluespace artillery!" - log_admin("[target.name] has been hit by Bluespace Artillery fired by [usr]") - message_admins("[target.name] has been hit by Bluespace Artillery fired by [usr]") diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm index 3f6b7aba90f..7f9387b9865 100644 --- a/code/modules/food&drinks/food/customizables.dm +++ b/code/modules/food&drinks/food/customizables.dm @@ -328,7 +328,7 @@ /obj/item/weapon/reagent_containers/glass/bowl/update_icon() overlays.Cut() - if(reagents.total_volume) + if(reagents && reagents.total_volume) var/image/filling = image('icons/obj/food/soupsalad.dmi', "fullbowl") filling.color = mix_color_from_reagents(reagents.reagent_list) overlays += filling diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 9b59fc95298..dae76683975 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -377,11 +377,13 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/plasmaman)) if(environment) - if((environment.oxygen /environment.total_moles()) >= 0.01) - if(!H.on_fire) - H.visible_message("[H]'s body reacts with the atmosphere and bursts into flames!","Your body reacts with the atmosphere and bursts into flame!") - H.adjust_fire_stacks(0.5) - H.IgniteMob() + var/total_moles = environment.total_moles() + if(total_moles) + if((environment.oxygen /total_moles) >= 0.01) + if(!H.on_fire) + H.visible_message("[H]'s body reacts with the atmosphere and bursts into flames!","Your body reacts with the atmosphere and bursts into flame!") + H.adjust_fire_stacks(0.5) + H.IgniteMob() else if(H.fire_stacks) var/obj/item/clothing/suit/space/eva/plasmaman/P = H.wear_suit diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 12b2222004a..da304074573 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -211,8 +211,8 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power() src.active = !src.active investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo") - message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) - log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr.ckey]([usr]) in ([x],[y],[z])") + message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name(usr, usr.client) : "outside forces"](?) in ([x],[y],[z] - JMP)",0,1) + log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[usr.ckey]([usr])" : "outside forces"] in ([x],[y],[z])") if(src.active) src.use_power = 2 for(var/obj/structure/particle_accelerator/part in connected_parts)