diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d625c4211d7..d02bc2ca794 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -16,6 +16,10 @@ /obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob, params) if(istype(user,/mob/living/silicon)) return + + if(G.flags & NODROP) + user << "you can drop it to charge it!" + return if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs)) if(charging) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index feafebd26f8..2c81fd09af3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -50,9 +50,9 @@ if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) ) return - if(M.get_int_organ(/obj/item/organ/internal/alien/plasmavessel)) + if(M.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) return - if(!user.get_int_organ(/obj/item/organ/internal/alien/plasmavessel)) + if(!user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) return unbuckle_mob() diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm index b94d58d91bf..133634bf489 100644 --- a/code/modules/surgery/organs/subtypes/xenos.dm +++ b/code/modules/surgery/organs/subtypes/xenos.dm @@ -114,6 +114,7 @@ /obj/item/organ/internal/xenos/acidgland name = "xeno acid gland" + icon_state = "acid" parent_organ = "head" slot = "acid" origin_tech = "biotech=5;materials=2;combat=2" @@ -122,6 +123,7 @@ /obj/item/organ/internal/xenos/hivenode name = "xeno hive node" + icon_state = "hivenode" parent_organ = "head" slot = "hivenode" origin_tech = "biotech=5;magnets=4;bluespace=3"