Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof

This commit is contained in:
Spades
2017-07-04 20:04:19 -04:00
2 changed files with 5 additions and 4 deletions
+1
View File
@@ -120,6 +120,7 @@
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
else
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/detective(H), slot_in_backpack) // Vorestation Edit
if(has_alt_title(H, alt_title,"Forensic Technician"))
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit, slot_r_hand)
@@ -166,23 +166,23 @@
skr_tentacle_veryshort
name = "Skrell Very Short Tentacles"
icon_state = "skrell_hair_veryshort"
species_allowed = list("Tajara", "Xenochimera")
species_allowed = list("Skrell", "Xenochimera")
gender = MALE
skr_tentacle_short
name = "Skrell Short Tentacles"
icon_state = "skrell_hair_short"
species_allowed = list("Tajara", "Xenochimera")
species_allowed = list("Skrell", "Xenochimera")
skr_tentacle_average
name = "Skrell Average Tentacles"
icon_state = "skrell_hair_average"
species_allowed = list("Tajara", "Xenochimera")
species_allowed = list("Skrell", "Xenochimera")
skr_tentacle_verylong
name = "Skrell Long Tentacles"
icon_state = "skrell_hair_verylong"
species_allowed = list("Tajara", "Xenochimera")
species_allowed = list("Skrell", "Xenochimera")
gender = FEMALE
// Vulpa stuffs