This commit is contained in:
Fox-McCloud
2016-04-04 17:01:03 -04:00
parent 3bd37ec757
commit b7afdec18c
32 changed files with 62 additions and 58 deletions

View File

@@ -94,3 +94,7 @@
#define DEFAULT_ITEM_PUTON_DELAY 20 //time taken (in deciseconsd) to reverse-strip somebody
#define IGNORE_ACCESS -1
#define CHEM_MOB_SPAWN_INVALID 0
#define CHEM_MOB_SPAWN_HOSTILE 1
#define CHEM_MOB_SPAWN_FRIENDLY 2

View File

@@ -40,7 +40,7 @@
var/obj/effect/blob/factory/factory = null
var/list/human_overlays = list()
var/is_zombie = 0
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
@@ -161,7 +161,7 @@
maxbodytemp = 360
force_threshold = 10
environment_smash = 3
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/blob/blobbernaut/blob_act()

View File

@@ -44,7 +44,7 @@
var/list/tear_critters = list()
for(var/T in typesof(/mob/living/simple_animal))
var/mob/living/simple_animal/SA = T
if(initial(SA.gold_core_spawnable) == 1)
if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE)
tear_critters += T
for(var/i in 1 to 5)

View File

@@ -18,7 +18,7 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 0)
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/butterfly/New()
..()

View File

@@ -20,7 +20,7 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/Runtime
@@ -33,7 +33,7 @@
gender = FEMALE
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/pet/cat/Runtime/handle_automated_action()
..()
@@ -99,4 +99,4 @@
faction = list("syndicate")
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID

View File

@@ -26,7 +26,7 @@
var/obj/item/inventory_head
var/obj/item/inventory_back
var/facehugger
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/pet/corgi/New()
..()
@@ -398,7 +398,7 @@
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/pet/corgi/Ian/process_ai()
..()
@@ -555,7 +555,7 @@
response_harm = "kicks"
var/turns_since_scan = 0
var/puppies = 0
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//Lisa already has a cute bow!
/mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list)

View File

@@ -22,7 +22,7 @@
var/obj/item/inventory_mask
can_hide = 1
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/crab/handle_automated_movement()
//CRAB movement
@@ -47,7 +47,7 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//LOOK AT THIS - ..()??
/*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob, params)

View File

@@ -15,4 +15,4 @@
response_disarm = "gently pushes aside"
response_harm = "kicks"
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY

View File

@@ -111,7 +111,7 @@
health = 50
var/milk_content = 0
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/cow/New()
..()
@@ -179,7 +179,7 @@
small = 1
can_hide = 1
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/chick/New()
..()
@@ -222,7 +222,7 @@ var/global/chicken_count = 0
small = 1
can_hide = 1
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/chicken/New()
..()
@@ -300,7 +300,7 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 50
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/turkey
name = "turkey"
@@ -322,7 +322,7 @@ var/global/chicken_count = 0
attacktext = "pecks"
health = 50
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/goose
name = "goose"
@@ -344,7 +344,7 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 50
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/seal
name = "seal"
@@ -366,7 +366,7 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 50
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/walrus
name = "walrus"
@@ -388,4 +388,4 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 50
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY

View File

@@ -17,13 +17,13 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
//Captain fox
/mob/living/simple_animal/pet/fox/Renault
name = "Renault"
desc = "Renault, the Captain's trustworthy fox. I wonder what it says?"
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//Syndi fox
/mob/living/simple_animal/pet/fox/Syndifox
@@ -35,4 +35,4 @@
icon_resting = "Syndifox_rest"
flags = NO_BREATHE
faction = list("syndicate")
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID

View File

@@ -22,4 +22,4 @@
can_hide = 1
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY

View File

@@ -31,7 +31,7 @@
can_hide = 1
holder_type = /obj/item/weapon/holder/mouse
can_collar = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/mouse/handle_automated_speech()
..()
@@ -145,4 +145,4 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID

View File

@@ -17,7 +17,7 @@
response_disarm = "bops"
response_harm = "kicks"
see_in_dark = 5
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/pet/pug/process_ai()
..()

View File

@@ -15,4 +15,4 @@
harm_intent_damage = 5
pass_flags = PASSTABLE
can_hide = 1
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY

View File

@@ -29,7 +29,7 @@
see_in_dark = 8
see_invisible = SEE_INVISIBLE_MINIMUM
heat_damage_per_tick = 20
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/alien/drone
@@ -128,7 +128,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/obj/item/projectile/neurotox
name = "neurotoxin"
@@ -153,7 +153,7 @@
icon_state = "maid"
icon_living = "maid"
icon_dead = "maid_dead"
gold_core_spawnable = 0 //no fun allowed
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //no fun allowed
/mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
if(istype(target, /atom/movable))

View File

@@ -29,7 +29,7 @@
faction = list("scarybat")
var/mob/living/owner
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob)
..()

View File

@@ -31,7 +31,7 @@
var/stance_step = 0
faction = list("russian")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
//SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/simple_animal/hostile/bear/Hudson

View File

@@ -33,7 +33,7 @@
faction = list("carp")
flying = 1
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/carp/Process_Spacemove(var/movement_dir = 0)
return 1 //No drifting in space for space carp! //original comments do not steal
@@ -54,7 +54,7 @@
icon_state = "holocarp"
icon_living = "holocarp"
maxbodytemp = INFINITY
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/hostile/carp/holocarp/death()
..()

View File

@@ -13,5 +13,5 @@
attacktext = "chomps"
attack_sound = 'sound/weapons/bite.ogg'
faction = list("creature")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE

View File

@@ -25,7 +25,7 @@
speed = 4
faction = list("faithless")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0)
return 1

View File

@@ -49,7 +49,7 @@
move_to_delay = 6
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
//nursemaids - these create webs and eggs
/mob/living/simple_animal/hostile/poison/giant_spider/nurse

View File

@@ -21,7 +21,7 @@
ventcrawler = 2
var/datum/mind/origin
var/egg_lain = 0
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim)

View File

@@ -21,7 +21,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speak_emote = list("states")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/hivebot/range
name = "Hivebot"

View File

@@ -30,7 +30,7 @@
layer = 3.1 //so they can stay hidde under the /obj/structure/bush
var/stalk_tick_delay = 3
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/panther/ListTargets()
var/list/targets = list()
@@ -88,7 +88,7 @@
layer = 3.1 //so they can stay hidde under the /obj/structure/bush
var/stalk_tick_delay = 3
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/snake/ListTargets()
var/list/targets = list()

View File

@@ -30,7 +30,7 @@
move_to_delay = 9
var/is_electronic = 0
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/mimic/FindTarget()
. = ..()
@@ -140,7 +140,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
var/mob/living/creator = null // the creator
var/destroy_objects = 0
var/knockdown_people = 0
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0)
..(loc)

View File

@@ -24,7 +24,7 @@
//Spaceborn beings don't get hurt by space
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/check_drift = 0)
return 1

View File

@@ -132,7 +132,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
flying = 1
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/viscerator/death()
..()

View File

@@ -28,7 +28,7 @@
minbodytemp = 0
faction = list("hostile", "winter")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/tree/FindTarget()
. = ..()

View File

@@ -33,7 +33,7 @@
bodytemperature = 73.0 //it's made of snow and hatred, so it's pretty cold.
maxbodytemp = 280.15 //at roughly 7 C, these will start melting (dying) from the warmth. Mind over matter or something.
heat_damage_per_tick = 10 //Now With Rapid Thawing Action!
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/winter/snowman/death()
@@ -64,7 +64,7 @@
melee_damage_lower = 5
melee_damage_upper = 10
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/winter/santa
maxHealth = 150 //if this seems low for a "boss", it's because you have to fight him multiple times, with him fully healing between stages

View File

@@ -82,7 +82,7 @@
//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
var/obj/item/held_item = null
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/parrot/New()
@@ -683,7 +683,7 @@
name = "Poly"
desc = "Poly the Parrot. An expert on quantum cracker theory."
speak = list("Poly wanna cracker!", ":eCheck the singlo, you chucklefucks!",":eCheck the tesla, you shits!",":eSTOP HOT-WIRING THE ENGINE, FUCKING CHRIST!",":eWire the solars, you lazy bums!",":eWHO TOOK THE DAMN HARDSUITS?",":eOH GOD ITS FREE CALL THE SHUTTLE")
gold_core_spawnable = 0
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/parrot/Poly/New()
ears = new /obj/item/device/radio/headset/headset_eng(src)

View File

@@ -67,7 +67,7 @@
var/scan_ready = 1
var/simplespecies //Sorry, no spider+corgi buttbabies.
var/gold_core_spawnable = 0 //if 1 can be spawned by plasma with gold core, 2 are 'friendlies' spawned with blood
var/gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //if CHEM_MOB_SPAWN_HOSTILE can be spawned by plasma with gold core, CHEM_MOB_SPAWN_FRIENDLY are 'friendlies' spawned with blood
var/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
var/sentience_type = SENTIENCE_ORGANIC // Sentience type, for slime potions

View File

@@ -17,7 +17,7 @@
speak = list("Hruuugh!","Hrunnph")
emote_see = list("paws the ground","shakes its mane","stomps")
emote_hear = list("snuffles")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/diyaab
name = "diyaab"
@@ -38,7 +38,7 @@
speak = list("Awrr?","Aowrl!","Worrl")
emote_see = list("sniffs the air cautiously","looks around")
emote_hear = list("snuffles")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/shantak
name = "shantak"
@@ -58,7 +58,7 @@
speak_chance = 5
speak = list("Shuhn","Shrunnph?","Shunpf")
emote_see = list("scratches the ground","shakes out it's mane","tinkles gently")
gold_core_spawnable = 1
gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/yithian
name = "yithian"
@@ -66,7 +66,7 @@
icon_state = "yithian"
icon_living = "yithian"
icon_dead = "yithian_dead"
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/tindalos
name = "tindalos"
@@ -74,4 +74,4 @@
icon_state = "tindalos"
icon_living = "tindalos"
icon_dead = "tindalos_dead"
gold_core_spawnable = 2
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY