diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 727a22f844..d0addbab21 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -57,8 +57,17 @@ /mob/living/carbon/alien/humanoid/Topic(href, href_list) ..() - //strip panel + //strip panel & embeds if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) + if(href_list["embedded_object"]) + var/obj/item/bodypart/L = locate(href_list["embedded_limb"]) in bodyparts + if(!L) + return + var/obj/item/I = locate(href_list["embedded_object"]) in L.embedded_objects + if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the alien anymore + return + SEND_SIGNAL(src, COMSIG_CARBON_EMBED_RIP, I, L) + return if(href_list["pouches"]) visible_message("[usr] tries to empty [src]'s pouches.", \ "[usr] tries to empty [src]'s pouches.") diff --git a/html/changelogs/AutoChangeLog-pr-12940.yml b/html/changelogs/AutoChangeLog-pr-12940.yml new file mode 100644 index 0000000000..f2dcf496ba --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12940.yml @@ -0,0 +1,5 @@ +author: "NecromancerAnne, Sirich96" +delete-after: True +changes: + - rscadd: "Stunbaton sprites by Sirich96." + - rscadd: "New sprites for the stunsword." diff --git a/html/changelogs/AutoChangeLog-pr-12941.yml b/html/changelogs/AutoChangeLog-pr-12941.yml new file mode 100644 index 0000000000..51c855520c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12941.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "aliens can remove embeds now" diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index 7e09d425fb..1c22a0ad1b 100644 Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 84bba1a578..57105cc089 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ