Merge pull request #11999 from Techhead0/DevFixes

Dev fixes: Sheets, Belts, Hair
This commit is contained in:
Chinsky
2016-01-17 03:45:38 +03:00
3 changed files with 4 additions and 5 deletions

View File

@@ -6,6 +6,7 @@
item_state = "utility"
storage_slots = 7
max_w_class = 3
max_storage_space = 28
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
sprite_sheets = list("Resomi" = 'icons/mob/species/resomi/belt.dmi')
@@ -114,8 +115,6 @@
desc = "Can hold security gear like handcuffs and flashes."
icon_state = "securitybelt"
item_state = "security"
max_w_class = 3
max_storage_space = 28
can_hold = list(
/obj/item/weapon/grenade,
/obj/item/weapon/reagent_containers/spray/pepper,
@@ -175,5 +174,3 @@
icon_state = "swatbelt"
item_state = "swatbelt"
storage_slots = 9
max_w_class = 3
max_storage_space = 28

View File

@@ -31,7 +31,7 @@ LINEN BINS
if(do_after(user, 50))
user << "<span class='notice'>You cut [src] into pieces!</span>"
for(var/i in 1 to rand(2,5))
new /obj/item/weapon/reagent_containers/glass/rag(src.loc)
new /obj/item/weapon/reagent_containers/glass/rag(get_turf(src))
qdel(src)
return
..()

View File

@@ -209,6 +209,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/prev_species = pref.species
pref.species = href_list["set_species"]
if(prev_species != pref.species)
mob_species = all_species[pref.species]
//grab one of the valid hair styles for the newly chosen species
var/list/valid_hairstyles = list()
for(var/hairstyle in hair_styles_list)