cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb.

Browse Source
This commit is contained in:
Erthilo
2012-05-20 21:37:10 +01:00
parent c091522cf7
commit f81b043787
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/items/item.dm
View File

@@ -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)

4
code/modules/mob/new_player/preferences.dm
View File

@@ -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"])