diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 66a64c08548..0c40aa4b50f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -725,9 +725,9 @@
unEquip(pocket_item)
usr.put_in_hands(pocket_item)
else
- if(place_item)
+ if(place_item && !(place_item.flags & NODROP))
usr.unEquip(place_item)
- equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
+ equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
// Update strip window
if(usr.machine == src && in_range(src, usr))
@@ -1786,4 +1786,4 @@
/mob/living/carbon/human/proc/get_full_print()
if(!dna || !dna.uni_identity)
return
- return md5(dna.uni_identity)
+ return md5(dna.uni_identity)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index ac707426430..0b904097fa3 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -129,6 +129,9 @@
switch(remove_from)
if("head")
if(inventory_head)
+ if(inventory_head.flags & NODROP)
+ usr << "\The [inventory_head] is stuck too hard to [src] for you to remove!"
+ return
name = real_name
desc = initial(desc)
speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
@@ -145,6 +148,9 @@
return
if("back")
if(inventory_back)
+ if(inventory_back.flags & NODROP)
+ usr << "\The [inventory_back] is stuck too hard to [src] for you to remove!"
+ return
inventory_back.loc = src.loc
inventory_back = null
regenerate_icons()
@@ -669,4 +675,4 @@
s.start()
respawnable_list += src
qdel(src)
- return
+ return
\ No newline at end of file
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 2c1c695bdcb..c7daecafce9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -792,8 +792,6 @@ var/list/slot_equipment_priority = list( \
if(href_list["flavor_change"])
update_flavor_text()
-
-// ..()
return