clean up gender declarations

This commit is contained in:
D3athrow
2015-03-12 12:51:58 -05:00
parent 74dd07633b
commit 4ded52118a
26 changed files with 108 additions and 108 deletions

View File

@@ -77,7 +77,7 @@
/obj/item/weapon/soap /obj/item/weapon/soap
name = "soap" name = "soap"
desc = "A cheap bar of soap. Doesn't smell." desc = "A cheap bar of soap. Doesn't smell."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "soap" icon_state = "soap"
w_class = 1.0 w_class = 1.0
@@ -178,7 +178,7 @@
/obj/item/weapon/legcuffs /obj/item/weapon/legcuffs
name = "legcuffs" name = "legcuffs"
desc = "Use this to keep prisoners in line." desc = "Use this to keep prisoners in line."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "handcuff" icon_state = "handcuff"
flags = FPRINT flags = FPRINT
@@ -191,7 +191,7 @@
/obj/item/weapon/legcuffs/bolas /obj/item/weapon/legcuffs/bolas
name = "bolas" name = "bolas"
desc = "An entangling bolas. Throw at your foes to trip them and prevent them from running." desc = "An entangling bolas. Throw at your foes to trip them and prevent them from running."
gender = (NEUTER) gender = NEUTER
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "bolas" icon_state = "bolas"
flags = FPRINT flags = FPRINT
@@ -577,7 +577,7 @@
/obj/item/weapon/table_parts /obj/item/weapon/table_parts
name = "table parts" name = "table parts"
desc = "Parts of a table. Poor table." desc = "Parts of a table. Poor table."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "table_parts" icon_state = "table_parts"
m_amt = 3750 m_amt = 3750
@@ -749,7 +749,7 @@
/obj/item/weapon/stock_parts /obj/item/weapon/stock_parts
name = "stock part" name = "stock part"
desc = "What?" desc = "What?"
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/stock_parts.dmi' icon = 'icons/obj/stock_parts.dmi'
w_class = 2.0 w_class = 2.0
var/rating = 1 var/rating = 1
@@ -961,7 +961,7 @@
/obj/item/weapon/ectoplasm /obj/item/weapon/ectoplasm
name = "ectoplasm" name = "ectoplasm"
desc = "spooky" desc = "spooky"
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/wizard.dmi' icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm" icon_state = "ectoplasm"
w_type = RECYK_BIOLOGICAL w_type = RECYK_BIOLOGICAL

View File

@@ -6,7 +6,7 @@ var/global/list/blood_list = list()
/obj/effect/decal/cleanable/blood /obj/effect/decal/cleanable/blood
name = "blood" name = "blood"
desc = "It's thick and gooey. Perhaps it's the chef's cooking?" desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -139,7 +139,7 @@ var/global/list/blood_list = list()
/obj/effect/decal/cleanable/blood/drip /obj/effect/decal/cleanable/blood/drip
name = "drips of blood" name = "drips of blood"
desc = "It's red." desc = "It's red."
gender = (PLURAL) gender = PLURAL
icon = 'icons/effects/drip.dmi' icon = 'icons/effects/drip.dmi'
icon_state = "1" icon_state = "1"
random_icon_states = list("1","2","3","4","5") random_icon_states = list("1","2","3","4","5")
@@ -150,7 +150,7 @@ var/global/list/blood_list = list()
/obj/effect/decal/cleanable/blood/writing /obj/effect/decal/cleanable/blood/writing
icon_state = "tracks" icon_state = "tracks"
desc = "It looks like a writing in blood." desc = "It looks like a writing in blood."
gender = (NEUTER) gender = NEUTER
random_icon_states = list("writing1","writing2","writing3","writing4","writing5") random_icon_states = list("writing1","writing2","writing3","writing4","writing5")
amount = 0 amount = 0
var/message var/message
@@ -171,7 +171,7 @@ var/global/list/blood_list = list()
/obj/effect/decal/cleanable/blood/gibs /obj/effect/decal/cleanable/blood/gibs
name = "gibs" name = "gibs"
desc = "They look bloody and gruesome." desc = "They look bloody and gruesome."
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2

View File

@@ -1,7 +1,7 @@
/obj/effect/decal/cleanable/generic /obj/effect/decal/cleanable/generic
name = "clutter" name = "clutter"
desc = "Someone should clean that up." desc = "Someone should clean that up."
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -11,7 +11,7 @@
/obj/effect/decal/cleanable/ash /obj/effect/decal/cleanable/ash
name = "ashes" name = "ashes"
desc = "Ashes to ashes, dust to dust, and into space." desc = "Ashes to ashes, dust to dust, and into space."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "ash" icon_state = "ash"
anchored = 1 anchored = 1
@@ -23,7 +23,7 @@
/obj/effect/decal/cleanable/dirt /obj/effect/decal/cleanable/dirt
name = "dirt" name = "dirt"
desc = "Someone should clean that up." desc = "Someone should clean that up."
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -34,7 +34,7 @@
/obj/effect/decal/cleanable/flour /obj/effect/decal/cleanable/flour
name = "flour" name = "flour"
desc = "It's still good. Four second rule!" desc = "It's still good. Four second rule!"
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -44,7 +44,7 @@
/obj/effect/decal/cleanable/greenglow /obj/effect/decal/cleanable/greenglow
name = "glowing goo" name = "glowing goo"
desc = "Jeez. I hope that's not for lunch." desc = "Jeez. I hope that's not for lunch."
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -83,7 +83,7 @@
/obj/effect/decal/cleanable/vomit /obj/effect/decal/cleanable/vomit
name = "vomit" name = "vomit"
desc = "Gosh, how unpleasant." desc = "Gosh, how unpleasant."
gender = (PLURAL) gender = PLURAL
density = 0 density = 0
anchored = 1 anchored = 1
layer = 2 layer = 2
@@ -155,7 +155,7 @@
/obj/effect/decal/cleanable/soot /obj/effect/decal/cleanable/soot
name = "soot" name = "soot"
desc = "One hell of a party..." desc = "One hell of a party..."
gender = (PLURAL) gender = PLURAL
icon = 'icons/effects/tile_effects.dmi' icon = 'icons/effects/tile_effects.dmi'
icon_state = "tile_soot" icon_state = "tile_soot"
anchored = 1 anchored = 1

View File

@@ -201,7 +201,7 @@ var/global/list/image/fluidtrack_cache=list()
coming_state = "wheels" coming_state = "wheels"
going_state = "" going_state = ""
desc = "They look like tracks left by wheels." desc = "They look like tracks left by wheels."
gender = (PLURAL) gender = PLURAL
random_icon_states = null random_icon_states = null
amount = 0 amount = 0

View File

@@ -4,7 +4,7 @@
/obj/effect/decal/remains/human /obj/effect/decal/remains/human
name = "remains" name = "remains"
desc = "They look like human remains. They have a strange aura about them." desc = "They look like human remains. They have a strange aura about them."
gender = (PLURAL) gender = PLURAL
icon = 'icons/effects/blood.dmi' icon = 'icons/effects/blood.dmi'
icon_state = "remains" icon_state = "remains"
anchored = 1 anchored = 1
@@ -12,7 +12,7 @@
/obj/effect/decal/remains/xeno /obj/effect/decal/remains/xeno
name = "remains" name = "remains"
desc = "They look like the remains of something... alien. They have a strange aura about them." desc = "They look like the remains of something... alien. They have a strange aura about them."
gender = (PLURAL) gender = PLURAL
icon = 'icons/effects/blood.dmi' icon = 'icons/effects/blood.dmi'
icon_state = "remainsxeno" icon_state = "remainsxeno"
anchored = 1 anchored = 1
@@ -20,7 +20,7 @@
/obj/effect/decal/remains/robot /obj/effect/decal/remains/robot
name = "remains" name = "remains"
desc = "They look like the remains of something mechanical. They have a strange aura about them." desc = "They look like the remains of something mechanical. They have a strange aura about them."
gender = (PLURAL) gender = PLURAL
icon = 'icons/mob/robots.dmi' icon = 'icons/mob/robots.dmi'
icon_state = "remainsrobot" icon_state = "remainsrobot"
anchored = 1 anchored = 1

View File

@@ -1,7 +1,7 @@
/obj/effect/decal/slag /obj/effect/decal/slag
name = "slag puddle" name = "slag puddle"
desc = "The molten remains of something." desc = "The molten remains of something."
gender = (PLURAL) gender = PLURAL
icon = 'icons/effects/effects.dmi' icon = 'icons/effects/effects.dmi'
icon_state = "slagcold" icon_state = "slagcold"
anchored = 1 anchored = 1

View File

@@ -15,7 +15,7 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \
name = "cable coil" name = "cable coil"
icon = 'icons/obj/power.dmi' icon = 'icons/obj/power.dmi'
icon_state = "coil_red" icon_state = "coil_red"
gender = (NEUTER) gender = NEUTER
amount = MAXCOIL amount = MAXCOIL
singular_name = "cable pieces" singular_name = "cable pieces"
max_amount = MAXCOIL max_amount = MAXCOIL

View File

@@ -99,7 +99,7 @@
/obj/item/stack/medical/ointment /obj/item/stack/medical/ointment
name = "ointment" name = "ointment"
desc = "Used to treat those nasty burns." desc = "Used to treat those nasty burns."
gender = (PLURAL) gender = PLURAL
singular_name = "ointment" singular_name = "ointment"
icon_state = "ointment" icon_state = "ointment"
origin_tech = "biotech=1" origin_tech = "biotech=1"

View File

@@ -8,7 +8,7 @@
* Stacks * Stacks
*/ */
/obj/item/stack /obj/item/stack
gender = (PLURAL) gender = PLURAL
origin_tech = "materials=1" origin_tech = "materials=1"
var/list/datum/stack_recipe/recipes var/list/datum/stack_recipe/recipes
var/singular_name var/singular_name

View File

@@ -10,7 +10,7 @@ var/global/list/moneytypes=list(
/obj/item/weapon/spacecash /obj/item/weapon/spacecash
name = "credit chip" name = "credit chip"
desc = "Money money money." desc = "Money money money."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/money.dmi' icon = 'icons/obj/money.dmi'
icon_state = "cash1" icon_state = "cash1"
opacity = 0 opacity = 0

View File

@@ -3,7 +3,7 @@
/obj/item/weapon/plastique /obj/item/weapon/plastique
name = "plastic explosives" name = "plastic explosives"
desc = "Used to put holes in specific areas without too much extra hole." desc = "Used to put holes in specific areas without too much extra hole."
gender = (PLURAL) gender = PLURAL
icon = 'icons/obj/assemblies.dmi' icon = 'icons/obj/assemblies.dmi'
icon_state = "plastic-explosive0" icon_state = "plastic-explosive0"
item_state = "plasticx" item_state = "plasticx"

View File

@@ -101,7 +101,7 @@ BLIND // can't see anything
//Gloves //Gloves
/obj/item/clothing/gloves /obj/item/clothing/gloves
name = "gloves" name = "gloves"
gender = (PLURAL) //Carn: for grammarically correct text-parsing gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2.0 w_class = 2.0
icon = 'icons/obj/clothing/gloves.dmi' icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.50 siemens_coefficient = 0.50
@@ -190,7 +190,7 @@ BLIND // can't see anything
name = "shoes" name = "shoes"
icon = 'icons/obj/clothing/shoes.dmi' icon = 'icons/obj/clothing/shoes.dmi'
desc = "Comfortable-looking shoes." desc = "Comfortable-looking shoes."
gender = (PLURAL) //Carn: for grammarically correct text-parsing gender = PLURAL //Carn: for grammarically correct text-parsing
var/chained = 0 var/chained = 0
var/chaintype = null // Type of chain. var/chaintype = null // Type of chain.
siemens_coefficient = 0.9 siemens_coefficient = 0.9

View File

@@ -1,7 +1,7 @@
/obj/item/clothing/under/shorts /obj/item/clothing/under/shorts
name = "athletic shorts" name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!" desc = "95% Polyester, 5% Spandex!"
gender = (PLURAL) gender = PLURAL
flags = FPRINT | ONESIZEFITSALL flags = FPRINT | ONESIZEFITSALL
body_parts_covered = LOWER_TORSO body_parts_covered = LOWER_TORSO

View File

@@ -7,7 +7,7 @@
voice_name = "alien" voice_name = "alien"
//speak_emote = list("hisses") //speak_emote = list("hisses")
icon = 'icons/mob/alien.dmi' icon = 'icons/mob/alien.dmi'
gender = (NEUTER) gender = NEUTER
dna = null dna = null
languages = ALIEN languages = ALIEN

View File

@@ -1,5 +1,5 @@
/mob/living/carbon/ /mob/living/carbon/
gender = (MALE) gender = MALE
var/list/stomach_contents = list() var/list/stomach_contents = list()
var/list/datum/disease2/disease/virus2 = list() var/list/datum/disease2/disease/virus2 = list()
var/antibodies = 0 var/antibodies = 0

View File

@@ -10,7 +10,7 @@
maxHealth = 150 maxHealth = 150
health = 150 health = 150
gender = (NEUTER) gender = NEUTER
update_icon = 0 update_icon = 0
nutrition = 700 // 1000 = max nutrition = 700 // 1000 = max
@@ -62,7 +62,7 @@
maxHealth = 200 maxHealth = 200
health = 200 health = 200
gender = (NEUTER) gender = NEUTER
update_icon = 0 update_icon = 0
nutrition = 800 // 1200 = max nutrition = 800 // 1200 = max

View File

@@ -5,7 +5,7 @@
languages = MONKEY languages = MONKEY
icon_state = "monkey1" icon_state = "monkey1"
icon = 'icons/mob/monkey.dmi' icon = 'icons/mob/monkey.dmi'
gender = (NEUTER) gender = NEUTER
pass_flags = PASSTABLE pass_flags = PASSTABLE
update_icon = 0 ///no need to call regenerate_icon update_icon = 0 ///no need to call regenerate_icon

View File

@@ -1,5 +1,5 @@
/mob/living/silicon /mob/living/silicon
gender = (NEUTER) gender = NEUTER
voice_name = "synthesized voice" voice_name = "synthesized voice"
languages = ROBOT | HUMAN | MONKEY | ALIEN languages = ROBOT | HUMAN | MONKEY | ALIEN
var/syndicate = 0 var/syndicate = 0

View File

@@ -5,7 +5,7 @@
icon_state = "cat2" icon_state = "cat2"
icon_living = "cat2" icon_living = "cat2"
icon_dead = "cat2_dead" icon_dead = "cat2_dead"
gender = (MALE) gender = MALE
speak = list("Meow!", "Esp!", "Purr!", "HSSSSS") speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
speak_emote = list("purrs", "meows") speak_emote = list("purrs", "meows")
emote_hear = list("meows", "mews") emote_hear = list("meows", "mews")
@@ -32,7 +32,7 @@
icon_state = "cat" icon_state = "cat"
icon_living = "cat" icon_living = "cat"
icon_dead = "cat_dead" icon_dead = "cat_dead"
gender = (FEMALE) gender = FEMALE
/mob/living/simple_animal/cat/Life() /mob/living/simple_animal/cat/Life()
//MICE! //MICE!
@@ -83,4 +83,4 @@
icon_state = "kitten" icon_state = "kitten"
icon_living = "kitten" icon_living = "kitten"
icon_dead = "kitten_dead" icon_dead = "kitten_dead"
gender = (NEUTER) gender = NEUTER

View File

@@ -8,7 +8,7 @@
icon_dead = "corgi_dead" icon_dead = "corgi_dead"
health = 30 health = 30
maxHealth = 30 maxHealth = 30
gender = (MALE) gender = MALE
speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
speak_emote = list("barks", "woofs") speak_emote = list("barks", "woofs")
emote_hear = list("barks", "woofs", "yaps","pants") emote_hear = list("barks", "woofs", "yaps","pants")
@@ -367,7 +367,7 @@
/mob/living/simple_animal/corgi/Ian /mob/living/simple_animal/corgi/Ian
name = "Ian" name = "Ian"
real_name = "Ian" //Intended to hold the name without altering it. real_name = "Ian" //Intended to hold the name without altering it.
gender = (MALE) gender = MALE
desc = "It's a corgi." desc = "It's a corgi."
var/turns_since_scan = 0 var/turns_since_scan = 0
var/obj/movement_target var/obj/movement_target
@@ -483,7 +483,7 @@
/mob/living/simple_animal/corgi/Lisa /mob/living/simple_animal/corgi/Lisa
name = "Lisa" name = "Lisa"
real_name = "Lisa" real_name = "Lisa"
gender = (FEMALE) gender = FEMALE
desc = "It's a corgi with a cute pink bow." desc = "It's a corgi with a cute pink bow."
icon_state = "lisa" icon_state = "lisa"
icon_living = "lisa" icon_living = "lisa"

View File

@@ -3,9 +3,9 @@ datum/preferences
proc/randomize_appearance_for(var/mob/living/carbon/human/H) proc/randomize_appearance_for(var/mob/living/carbon/human/H)
if(H) if(H)
if(H.gender == MALE) if(H.gender == MALE)
gender = (MALE) gender = MALE
else else
gender = (FEMALE) gender = FEMALE
s_tone = random_skin_tone() s_tone = random_skin_tone()
h_style = random_hair_style(gender, species) h_style = random_hair_style(gender, species)
f_style = random_facial_hair_style(gender, species) f_style = random_facial_hair_style(gender, species)

View File

@@ -55,7 +55,7 @@
bald bald
name = "Bald" name = "Bald"
icon_state = "bald" icon_state = "bald"
gender = (MALE) gender = MALE
species_allowed = list("Human","Unathi","Grey","Plasmaman","Skellington") species_allowed = list("Human","Unathi","Grey","Plasmaman","Skellington")
short short
@@ -113,7 +113,7 @@
ponytail2 ponytail2
name = "Ponytail 2" name = "Ponytail 2"
icon_state = "hair_pa" icon_state = "hair_pa"
gender = (FEMALE) gender = FEMALE
ponytail3 ponytail3
name = "Ponytail 3" name = "Ponytail 3"
@@ -126,13 +126,13 @@
pompadour pompadour
name = "Pompadour" name = "Pompadour"
icon_state = "hair_pompadour" icon_state = "hair_pompadour"
gender = (MALE) gender = MALE
species_allowed = list("Human","Unathi") species_allowed = list("Human","Unathi")
quiff quiff
name = "Quiff" name = "Quiff"
icon_state = "hair_quiff" icon_state = "hair_quiff"
gender = (MALE) gender = MALE
bedhead bedhead
name = "Bedhead" name = "Bedhead"
@@ -149,41 +149,41 @@
beehive beehive
name = "Beehive" name = "Beehive"
icon_state = "hair_beehive" icon_state = "hair_beehive"
gender = (FEMALE) gender = FEMALE
species_allowed = list("Human","Unathi") species_allowed = list("Human","Unathi")
bobcurl bobcurl
name = "Bobcurl" name = "Bobcurl"
icon_state = "hair_bobcurl" icon_state = "hair_bobcurl"
gender = (FEMALE) gender = FEMALE
species_allowed = list("Human","Unathi") species_allowed = list("Human","Unathi")
bob bob
name = "Bob" name = "Bob"
icon_state = "hair_bobcut" icon_state = "hair_bobcut"
gender = (FEMALE) gender = FEMALE
species_allowed = list("Human","Unathi") species_allowed = list("Human","Unathi")
bowl bowl
name = "Bowl" name = "Bowl"
icon_state = "hair_bowlcut" icon_state = "hair_bowlcut"
gender = (MALE) gender = MALE
buzz buzz
name = "Buzzcut" name = "Buzzcut"
icon_state = "hair_buzzcut" icon_state = "hair_buzzcut"
gender = (MALE) gender = MALE
species_allowed = list("Human","Unathi") species_allowed = list("Human","Unathi")
crew crew
name = "Crewcut" name = "Crewcut"
icon_state = "hair_crewcut" icon_state = "hair_crewcut"
gender = (MALE) gender = MALE
combover combover
name = "Combover" name = "Combover"
icon_state = "hair_combover" icon_state = "hair_combover"
gender = (MALE) gender = MALE
devillock devillock
name = "Devil Lock" name = "Devil Lock"
@@ -208,12 +208,12 @@
afro_large afro_large
name = "Big Afro" name = "Big Afro"
icon_state = "hair_bigafro" icon_state = "hair_bigafro"
gender = (MALE) gender = MALE
sargeant sargeant
name = "Flat Top" name = "Flat Top"
icon_state = "hair_sargeant" icon_state = "hair_sargeant"
gender = (MALE) gender = MALE
emo emo
name = "Emo" name = "Emo"
@@ -230,17 +230,17 @@
hitop hitop
name = "Hitop" name = "Hitop"
icon_state = "hair_hitop" icon_state = "hair_hitop"
gender = (MALE) gender = MALE
jensen jensen
name = "Adam Jensen Hair" name = "Adam Jensen Hair"
icon_state = "hair_jensen" icon_state = "hair_jensen"
gender = (MALE) gender = MALE
gelled gelled
name = "Gelled Back" name = "Gelled Back"
icon_state = "hair_gelled" icon_state = "hair_gelled"
gender = (FEMALE) gender = FEMALE
spiky spiky
name = "Spiky" name = "Spiky"
@@ -253,33 +253,33 @@
kagami kagami
name = "Pigtails" name = "Pigtails"
icon_state = "hair_kagami" icon_state = "hair_kagami"
gender = (FEMALE) gender = FEMALE
himecut himecut
name = "Hime Cut" name = "Hime Cut"
icon_state = "hair_himecut" icon_state = "hair_himecut"
gender = (FEMALE) gender = FEMALE
braid braid
name = "Floorlength Braid" name = "Floorlength Braid"
icon_state = "hair_braid" icon_state = "hair_braid"
gender = (FEMALE) gender = FEMALE
flags = HAIRSTYLE_CANTRIP flags = HAIRSTYLE_CANTRIP
odango odango
name = "Odango" name = "Odango"
icon_state = "hair_odango" icon_state = "hair_odango"
gender = (FEMALE) gender = FEMALE
ombre ombre
name = "Ombre" name = "Ombre"
icon_state = "hair_ombre" icon_state = "hair_ombre"
gender = (FEMALE) gender = FEMALE
updo updo
name = "Updo" name = "Updo"
icon_state = "hair_updo" icon_state = "hair_updo"
gender = (FEMALE) gender = FEMALE
skinhead skinhead
name = "Skinhead" name = "Skinhead"
@@ -288,69 +288,69 @@
balding balding
name = "Balding Hair" name = "Balding Hair"
icon_state = "hair_e" icon_state = "hair_e"
gender = (MALE) // turnoff! gender = MALE // turnoff!
familyman familyman
name = "The Family Man" name = "The Family Man"
icon_state = "hair_thefamilyman" icon_state = "hair_thefamilyman"
gender = (MALE) gender = MALE
mahdrills mahdrills
name = "Drillruru" name = "Drillruru"
icon_state = "hair_drillruru" icon_state = "hair_drillruru"
gender = (FEMALE) gender = FEMALE
dandypomp dandypomp
name = "Dandy Pompadour" name = "Dandy Pompadour"
icon_state = "hair_dandypompadour" icon_state = "hair_dandypompadour"
gender = (MALE) gender = MALE
poofy poofy
name = "Poofy" name = "Poofy"
icon_state = "hair_poofy" icon_state = "hair_poofy"
gender = (FEMALE) gender = FEMALE
crono crono
name = "Toriyama" name = "Toriyama"
icon_state = "hair_toriyama" icon_state = "hair_toriyama"
gender = (MALE) gender = MALE
vegeta vegeta
name = "Toriyama 2" name = "Toriyama 2"
icon_state = "hair_toriyama2" icon_state = "hair_toriyama2"
gender = (MALE) gender = MALE
cia cia
name = "CIA" name = "CIA"
icon_state = "hair_cia" icon_state = "hair_cia"
gender = (MALE) gender = MALE
mulder mulder
name = "Mulder" name = "Mulder"
icon_state = "hair_mulder" icon_state = "hair_mulder"
gender = (MALE) gender = MALE
scully scully
name = "Scully" name = "Scully"
icon_state = "hair_scully" icon_state = "hair_scully"
gender = (FEMALE) gender = FEMALE
marisa marisa
name = "Marisa" name = "Marisa"
icon_state = "hair_marisa" icon_state = "hair_marisa"
gender = (FEMALE) gender = FEMALE
additional_accessories = 1 additional_accessories = 1
nitori nitori
name = "Nitori" name = "Nitori"
icon_state = "hair_nitori" icon_state = "hair_nitori"
gender = (FEMALE) gender = FEMALE
additional_accessories = 1 additional_accessories = 1
joestar joestar
name = "Joestar" name = "Joestar"
icon_state = "hair_joestar" icon_state = "hair_joestar"
gender = (MALE) gender = MALE
metal metal
name = "Metal" name = "Metal"
@@ -359,57 +359,57 @@
edgeworth edgeworth
name = "Edgeworth" name = "Edgeworth"
icon_state = "hair_edgeworth" icon_state = "hair_edgeworth"
gender = (MALE) gender = MALE
objection objection
name = "Objection!" name = "Objection!"
icon_state = "hair_objection" icon_state = "hair_objection"
gender = (MALE) gender = MALE
dubs dubs
name = "Check 'Em" name = "Check 'Em"
icon_state = "hair_dubs" icon_state = "hair_dubs"
gender = (MALE) gender = MALE
swordsman swordsman
name = "Black Swordsman" name = "Black Swordsman"
icon_state = "hair_blackswordsman" icon_state = "hair_blackswordsman"
gender = (MALE) gender = MALE
mentalist mentalist
name = "Mentalist" name = "Mentalist"
icon_state = "hair_mentalist" icon_state = "hair_mentalist"
gender = (MALE) gender = MALE
fujisaki fujisaki
name = "Fujisaki" name = "Fujisaki"
icon_state = "hair_fujisaki" icon_state = "hair_fujisaki"
gender = (FEMALE) gender = FEMALE
schierke schierke
name = "Schierke" name = "Schierke"
icon_state = "hair_schierke" icon_state = "hair_schierke"
gender = (FEMALE) gender = FEMALE
akari akari
name = "Akari" name = "Akari"
icon_state = "hair_akari" icon_state = "hair_akari"
gender = (FEMALE) gender = FEMALE
fujiyabashi fujiyabashi
name = "Fujuyabashi" name = "Fujuyabashi"
icon_state = "hair_fujiyabashi" icon_state = "hair_fujiyabashi"
gender = (FEMALE) gender = FEMALE
nia nia
name = "Nia" name = "Nia"
icon_state = "hair_nia" icon_state = "hair_nia"
gender = (FEMALE) gender = FEMALE
shinobu shinobu
name = "Shinobu" name = "Shinobu"
icon_state = "hair_shinobu" icon_state = "hair_shinobu"
gender = (FEMALE) gender = FEMALE
bald bald
name = "Bald" name = "Bald"
@@ -425,12 +425,12 @@
/datum/sprite_accessory/facial_hair /datum/sprite_accessory/facial_hair
icon = 'icons/mob/human_face.dmi' icon = 'icons/mob/human_face.dmi'
gender = (MALE) // barf (unless you're a dorf, dorfs dig chix /w beards :P) gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
shaved shaved
name = "Shaved" name = "Shaved"
icon_state = "bald" icon_state = "bald"
gender = (NEUTER) gender = NEUTER
species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Grey","Plasmaman","Skellington") species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Grey","Plasmaman","Skellington")
watson watson
@@ -549,42 +549,42 @@
name = "Skrell Male Tentacles" name = "Skrell Male Tentacles"
icon_state = "skrell_hair_m" icon_state = "skrell_hair_m"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (MALE) gender = MALE
do_colouration = 0 do_colouration = 0
skr_tentacle_f skr_tentacle_f
name = "Skrell Female Tentacles" name = "Skrell Female Tentacles"
icon_state = "skrell_hair_f" icon_state = "skrell_hair_f"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (FEMALE) gender = FEMALE
do_colouration = 0 do_colouration = 0
skr_gold_m skr_gold_m
name = "Gold plated Skrell Male Tentacles" name = "Gold plated Skrell Male Tentacles"
icon_state = "skrell_goldhair_m" icon_state = "skrell_goldhair_m"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (MALE) gender = MALE
do_colouration = 0 do_colouration = 0
skr_gold_f skr_gold_f
name = "Gold chained Skrell Female Tentacles" name = "Gold chained Skrell Female Tentacles"
icon_state = "skrell_goldhair_f" icon_state = "skrell_goldhair_f"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (FEMALE) gender = FEMALE
do_colouration = 0 do_colouration = 0
skr_clothtentacle_m skr_clothtentacle_m
name = "Cloth draped Skrell Male Tentacles" name = "Cloth draped Skrell Male Tentacles"
icon_state = "skrell_clothhair_m" icon_state = "skrell_clothhair_m"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (MALE) gender = MALE
do_colouration = 0 do_colouration = 0
skr_clothtentacle_f skr_clothtentacle_f
name = "Cloth draped Skrell Female Tentacles" name = "Cloth draped Skrell Female Tentacles"
icon_state = "skrell_clothhair_f" icon_state = "skrell_clothhair_f"
species_allowed = list("Skrell") species_allowed = list("Skrell")
gender = (FEMALE) gender = FEMALE
do_colouration = 0 do_colouration = 0
taj_ears taj_ears

View File

@@ -5,7 +5,7 @@
/obj/item/weapon/paper /obj/item/weapon/paper
name = "paper" name = "paper"
gender = (NEUTER) gender = NEUTER
icon = 'icons/obj/bureaucracy.dmi' icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper" icon_state = "paper"
throwforce = 0 throwforce = 0

View File

@@ -9,7 +9,7 @@
desc = "A pack of papers, secured by some red ribbon." desc = "A pack of papers, secured by some red ribbon."
icon = 'icons/obj/paper.dmi' icon = 'icons/obj/paper.dmi'
icon_state = "pp_large" icon_state = "pp_large"
gender = (NEUTER) gender = NEUTER
throwforce = 2 throwforce = 2
w_class = 3.0 w_class = 3.0
throw_range = 5 throw_range = 5
@@ -89,7 +89,7 @@
desc = "A red ribbon, normally used to tie things up." desc = "A red ribbon, normally used to tie things up."
icon = 'icons/obj/paper.dmi' icon = 'icons/obj/paper.dmi'
icon_state = "ribbon" icon_state = "ribbon"
gender = (NEUTER) gender = NEUTER
slot_flags = SLOT_HEAD slot_flags = SLOT_HEAD
throwforce = 0 throwforce = 0
w_class = 1.0 w_class = 1.0

View File

@@ -55,7 +55,7 @@
desc = "Great for toppings!" desc = "Great for toppings!"
icon_state = "cherry" icon_state = "cherry"
filling_color = "#FF0000" filling_color = "#FF0000"
gender = (PLURAL) gender = PLURAL
plantname = "cherry" plantname = "cherry"
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
@@ -217,7 +217,7 @@
name = "bunch of poison-berries" name = "bunch of poison-berries"
desc = "Taste so good, you could die!" desc = "Taste so good, you could die!"
icon_state = "poisonberrypile" icon_state = "poisonberrypile"
gender = (PLURAL) gender = PLURAL
potency = 15 potency = 15
filling_color = "#B422C7" filling_color = "#B422C7"
plantname = "poisonberries" plantname = "poisonberries"
@@ -226,7 +226,7 @@
name = "bunch of death-berries" name = "bunch of death-berries"
desc = "Taste so good, you could die!" desc = "Taste so good, you could die!"
icon_state = "deathberrypile" icon_state = "deathberrypile"
gender = (PLURAL) gender = PLURAL
potency = 50 potency = 50
filling_color = "#4E0957" filling_color = "#4E0957"
plantname = "deathberries" plantname = "deathberries"
@@ -382,7 +382,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
name = "soybeans" name = "soybeans"
desc = "It's pretty bland, but oh the possibilities..." desc = "It's pretty bland, but oh the possibilities..."
gender = (PLURAL) gender = PLURAL
filling_color = "#E6E8B7" filling_color = "#E6E8B7"
icon_state = "soybeans" icon_state = "soybeans"
plantname = "soybean" plantname = "soybean"
@@ -461,7 +461,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
name = "wheat" name = "wheat"
desc = "Sigh... wheat... a-grain?" desc = "Sigh... wheat... a-grain?"
gender = (PLURAL) gender = PLURAL
icon_state = "wheat" icon_state = "wheat"
filling_color = "#F7E186" filling_color = "#F7E186"
plantname = "wheat" plantname = "wheat"
@@ -469,7 +469,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk /obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk
name = "rice stalk" name = "rice stalk"
desc = "Rice to see you." desc = "Rice to see you."
gender = (PLURAL) gender = PLURAL
icon_state = "rice" icon_state = "rice"
filling_color = "#FFF8DB" filling_color = "#FFF8DB"
plantname = "rice" plantname = "rice"

View File

@@ -6,7 +6,7 @@
desc = "An electromagnetic scanner used by mechanics. Capable of storing objects and machines as portable designs." desc = "An electromagnetic scanner used by mechanics. Capable of storing objects and machines as portable designs."
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "mechanic" icon_state = "mechanic"
gender = (NEUTER) gender = NEUTER
var/list/loaded_designs = list() //the stored designs var/list/loaded_designs = list() //the stored designs
var/max_designs = 10 var/max_designs = 10
var/syndi_filter = 1 //whether the scanner should filter traitor tech items. 1 is filtered, 0 is not filtered var/syndi_filter = 1 //whether the scanner should filter traitor tech items. 1 is filtered, 0 is not filtered