diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index 09f51e302bc..7e269078e85 100755 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -78,21 +78,24 @@ obj/item/verb/pick_up() if(!(usr)) return - if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain))) + if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain usr << "\red You can't pick things up!" return - if(!istype(src.loc, /turf) || usr.stat || usr.restrained() ) + if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained usr << "\red You can't pick things up!" return - if(src.anchored) + if(src.anchored) //Object isn't anchored usr << "\red You can't pick that up!" return - if(!usr.hand && usr.r_hand) + if(!usr.hand && usr.r_hand) //Right hand is not full usr << "\red Your right hand is full." return - if(usr.hand && usr.l_hand) + if(usr.hand && usr.l_hand) //Left hand is not full usr << "\red Your left hand is full." return + if(!istype(src.loc, /turf)) //Object is on a turf + usr << "\red You can't pick that up!" + return //All checks are done, time to pick it up! if(istype(usr, /mob/living/carbon/human)) src.attack_hand(usr) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index ecd5812de5a..0e26e085157 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -714,9 +714,9 @@ datum/preferences new_species += "Soghun" species = input("Please select a species", "Character Generation", null) in new_species h_style = "Bald" //Try not to carry face/head hair over. - hair_style = "Bald" f_style = "Shaved" - facial_hair_style = "Shaved" + hair_style = new/datum/sprite_accessory/hair/bald + facial_hair_style = new/datum/sprite_accessory/facial_hair/shaved if(link_tags["hair"]) switch(link_tags["hair"])