diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index d86354f195..adc20039ee 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -114,9 +114,9 @@ var/moodlet = "honk" //used to define which kind of moodlet is added to the honked target var/honksound = 'sound/items/bikehorn.ogg' -/obj/item/bikehorn/Initialize() +/obj/item/bikehorn/ComponentInitialize() . = ..() - AddComponent(/datum/component/squeak, list(honksound=1), 50) + AddComponent(/datum/component/squeak, list("[honksound]" = 1), 50) //Because list() is using named argument syntax here, we need to wrap the honksound between double quotes to pass it down correctly. /obj/item/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, moodlet, /datum/mood_event/honk) @@ -124,7 +124,7 @@ /obj/item/bikehorn/suicide_act(mob/user) user.visible_message("[user] solemnly points the horn at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(src, 'sound/items/bikehorn.ogg', 50, 1) + playsound(src, honksound, 50, 1) return (BRUTELOSS) //air horn diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 550593e316..c18fc36e9a 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -522,10 +522,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp //gets ID card object from special clothes slot or null. /mob/proc/get_idcard(hand_first = TRUE) var/obj/item/held_item = get_active_held_item() - . = held_item?.GetID() + . = held_item ? held_item.GetID() : null if(!.) //If so, then check the inactive hand held_item = get_inactive_held_item() - . = held_item?.GetID() + . = held_item ? held_item.GetID() : null /mob/proc/get_id_in_hand() var/obj/item/held_item = get_active_held_item() diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 1eb75e042b..3a20501832 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -382,9 +382,10 @@ /obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) if(beaker) - beaker.forceMove(drop_location()) + var/obj/item/reagent_containers/B = beaker + B.forceMove(drop_location()) if(user && Adjacent(user) && !issiliconoradminghost(user)) - user.put_in_hands(beaker) + user.put_in_hands(B) if(new_beaker) beaker = new_beaker else @@ -396,7 +397,6 @@ cell = null if(beaker) beaker.forceMove(drop_location()) - beaker = null return ..() /obj/machinery/chem_dispenser/proc/get_macro_resolution() diff --git a/html/changelogs/AutoChangeLog-pr-9886.yml b/html/changelogs/AutoChangeLog-pr-9886.yml new file mode 100644 index 0000000000..64c011e37c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9886.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "chem dispenser beakers end up in your hand yet again." + - bugfix: "Bikehorns squeak yet again, the world is safe." diff --git a/html/changelogs/AutoChangeLog-pr-9908.yml b/html/changelogs/AutoChangeLog-pr-9908.yml new file mode 100644 index 0000000000..fb0ae06238 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9908.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "fixed rogue pixels on the energy gu- ahem blaster carbine... and a few apc lights states being neigh-indistinguishable." diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index ca339b5262..d23af6c9b4 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 3273c518d7..1ba953d284 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ