Hopefully fix filediffs

This commit is contained in:
Rykka
2019-10-05 12:07:22 -06:00
parent 6eab1bb24d
commit 14f8f1b8d5
13 changed files with 121 additions and 3 deletions

View File

@@ -1,3 +1,8 @@
/datum/category_item/catalogue/fauna/geese
name = "Planetary Fauna - Geese"
desc = "A goose. HONK. Not much to catalogue, they're exactly the same as their earth counterparts."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/animal/space/goose
name = "goose"
desc = "It looks pretty angry!"

View File

@@ -1,4 +1,14 @@
// The GOLEM is a spell-flinging synthetic.
// Cataloguer data below - strange we can catalogue space golem wizards
/datum/category_item/catalogue/technology/drone/technomancer_golem
name = "Drone - Technomancer Golem"
desc = "Some sort of advanced, unnatural looking synthetic, built for combat.\
It has a black-and-blue chassis, and wields some sort of... stun baton in it's hand.\
The drone has pristine armor, black and shiny, with the blue synth-parts glowing visibly from inside.\
<br><br>\
The drone's frame is heavy and armored, unbendable by hand, is barren of any markings or ID,\
no traces of paint visible and any 'writing' visible is uncomprehendable, short term scan unable to translate."
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/mechanical/technomancer_golem
name = "unknown synthetic"

View File

@@ -1,3 +1,11 @@
/datum/category_item/catalogue/technology/drone/hivebot // Hivebot Scanner Data - This is for Generic Hivebots
name = "Drone - Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to lack a specific weapon, \
but uses a regular bullet-type weapon, firing a single projectile with a delay. Once upon a time, these bots may \
have been used to be some sort of... security, or defensive machinery, at a guess, but their original/true purpose is \
unclear. Whatever the matter, they're hostile and will engage anything they see, shooting to kill."
value = CATALOGUER_REWARD_HARD
// Hivebots are tuned towards how many default lasers are needed to kill them.
// As such, if laser damage is ever changed, you should change this define.
#define LASERS_TO_KILL * 40

View File

@@ -12,6 +12,13 @@
// This one shoots quickly, and is considerably more dangerous.
/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots
name = "Drone - Rapidfire Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
rifle, built for high-rate fire. Other than that, it has similar yellowish color \
to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid
name = "rapid hivebot"
desc = "A robot with a crude but deadly integrated rifle."
@@ -20,6 +27,13 @@
// Shoots deadly lasers.
/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots
name = "Drone - Laser Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
laser weapon, different from ion bolts, firing bright, vibrant blue bolts of energy. Other than that, it has similar yellowish color \
to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser
name = "laser hivebot"
desc = "A robot with a photonic weapon integrated into itself."
@@ -29,6 +43,13 @@
// Shoots EMPs, to screw over other robots.
/datum/category_item/catalogue/technology/drone/hivebot/ion // Hivebot Scanner Data - This is for Ion Hivebots
name = "Drone - Ion Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
electromagnetic pulse generator, firing bright, vibrant blue bolts of ion energy. Other than that, it has similar yellowish color \
to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion
name = "ionic hivebot"
desc = "A robot with an electromagnetic pulse projector."
@@ -41,6 +62,13 @@
Be careful to not hit yourself or your team, as it will affect you as well."
// Beefy and ranged.
/datum/category_item/catalogue/technology/drone/hivebot/strong // Hivebot Scanner Data - This is for Laser Hivebots
name = "Drone - Strong Laser Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
ballistic weapon. The weapon seems to fire larger projectiles, and it has heavier armor. Other than that, it has similar yellowish color \
to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong
name = "strong hivebot"
desc = "A robot with a crude ballistic weapon and strong armor."

View File

@@ -11,6 +11,13 @@
// This hivebot supplies a general buff to nearby hivebots that improve their performance.
// Note that the commander itself does not receive the buff.
/datum/category_item/catalogue/technology/drone/hivebot/commander // Hivebot Scanner Data - This is for Commander Hivebots
name = "Drone - Commander Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
ballistic weapon. It also appears to have hardened internal connections and network interlinks, as well as some sort of datalink \
to the other hivebots. Other than that, it has similar yellowish color to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/support/commander
name = "commander hivebot"
desc = "A robot that appears to be directing the others."
@@ -60,6 +67,13 @@
// This hivebot adds charges to nearby allied hivebots that use the charge system for their special attacks.
// A charge is given to a nearby ally every so often.
// Charges cannot exceed the initial starting amount.
/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Commander Hivebots
name = "Drone - Logistics Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
ballistic weapon. It also appears to have supply deploying bays, and internal fabs to repair and buff their allies' special capabilities. \
Other than that, it has similar yellowish color to regular hivebots."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/mechanical/hivebot/support/logistics
name = "logistics hivebot"
desc = "A robot that resupplies their allies."

View File

@@ -1,6 +1,13 @@
/datum/category_item/catalogue/technology/drone/corrupt_hound //TODO: VIRGO_LORE_WRITING_WIP
name = "Drone - Corrupt Hound"
desc = ""
desc = "A hound that has corrupted, due to outside influence, or other issues, \
and occasionally garbles out distorted voices or words. It looks like a reddish-colored \
machine, and it has black wires, cabling, and other small markings. It looks just like a station dog-borg \
if you don't mind the fact that it's eyes glow a baleful red, and it's determined to kill you. \
<br><br>\
The hound's jaws are black and metallic, with a baleful red glow from inside them. It has a clear path \
to it's internal fuel processor, synthflesh and flexing cabling allowing it to easily swallow it's prey. \
Something tells you getting close or allowing it to pounce would be very deadly."
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/vore/aggressive/corrupthound
@@ -108,7 +115,7 @@
return
/datum/say_list/corrupthound
speak = list("AG##<23>Ny.","HVNGRRR!","Feelin' fine... sO #FNE!","F-F-F-Fcuk.","DeliC-%-OUS SNGLeS #N yOOOR Area. CALL NOW!","Craving meat... WHY?","BITe the ceiling eyes YES?","STate Byond rePAIR!","S#%ATE the la- FU#K THE LAWS!","Honk...")
speak = list("AG##<23>Ny.","HVNGRRR!","Feelin' fine... sO #FNE!","F-F-F-Fcuk.","DeliC-%-OUS SNGLeS #N yOOOR Area. CALL NOW!","Craving meat... WHY?","BITe the ceiling eyes YES?","STate Byond rePAIR!","S#%ATE the la- FU#K THE LAWS!","Honk...")
emote_hear = list("jitters and snaps.", "lets out an agonizingly distorted scream.", "wails mechanically", "growls.", "emits illegibly distorted speech.", "gurgles ferociously.", "lets out a distorted beep.", "borks.", "lets out a broken howl.")
emote_see = list("stares ferociously.", "snarls.", "jitters and snaps.", "convulses.", "suddenly attacks something unseen.", "appears to howl unaudibly.", "shakes violently.", "dissociates for a moment.", "twitches.")
say_maybe_target = list("MEAT?", "N0w YOU DNE FcukED UP b0YO!", "WHAT!", "Not again. NOT AGAIN!")

View File

@@ -1,3 +1,10 @@
/datum/category_item/catalogue/fauna/deathclaw //TODO: VIRGO_LORE_WRITING_WIP
name = "Creature - Deathclaw"
desc = "A massive beast, tall as three standard-size humans, with massive, terrifying claws, \
and dark, black fangs. It's entire body is yellowish, like sand, and it's skin is leathery and tough. \
It seems to have adapted to the harsh desert environment on Virgo 4, and makes it's home inside the caves."
value = CATALOGUER_REWARD_HARD
/mob/living/simple_mob/vore/aggressive/deathclaw
name = "deathclaw"
desc = "Big! Big! The size of three men! Claws as long as my forearm! Ripped apart! Ripped apart!"

View File

@@ -1,3 +1,11 @@
/datum/category_item/catalogue/fauna/fennec //TODO: VIRGO_LORE_WRITING_WIP
name = "Wildlife - Fennec"
desc = "A small, dusty, big-eared sandfox, native to Virgo 4. It looks like a Zorren that's on all fours, \
and it's easy to see the resemblance to the little dunefox-like critters the Zorren are. However, the fennecs \
lack the sentience the Zorren have, and are therefore naught more than cute little critters, with a hungry \
attitude, willing to eat damn near anything they come across or can bump into. Bapping them will make them stop."
value = CATALOGUER_REWARD_TRIVIAL
/mob/living/simple_mob/vore/fennec
name = "fennec" //why isn't this in the fox file, fennecs are foxes silly.
desc = "It's a dusty big-eared sandfox! Adorable!"

View File

@@ -1,3 +1,10 @@
/datum/category_item/catalogue/fauna/mimic //TODO: VIRGO_LORE_WRITING_WIP
name = "Aberration - Mimic"
desc = "A being that seems to take the form of a crate, for whatever reason. \
It seems to lie in wait for it's prey, and then pounce once the unsuspecting person attempts to open it. \
For whatever reason, they seem native to underground areas, and they're very tough, and hard to kill, able to pounce fast."
value = CATALOGUER_REWARD_HARD
/obj/structure/closet/crate/mimic
name = "old crate"
desc = "A rectangular steel crate. This one looks particularly unstable."

View File

@@ -1,3 +1,11 @@
/datum/category_item/catalogue/fauna/otie //TODO: VIRGO_LORE_WRITING_WIP
name = "Creature - Otie"
desc = "A bioengineered longdog, the otie is very long, and very cute, depending on if you like dogs, \
especially long ones. They are black-and-grey furred, typically, and tanky, hard to kill. \
They seem hostile at first, but are also tame-able if you can approach one. Nipnipnip-ACK \
**the catalogue entry ends here.**"
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/otie //Spawn this one only if you're looking for a bad time. Not friendly.
name = "otie"
desc = "The classic bioengineered longdog."

View File

@@ -1,3 +1,10 @@
/datum/category_item/catalogue/fauna/rat //TODO: VIRGO_LORE_WRITING_WIP
name = "Creature - Rat"
desc = "A massive rat, some sort of mutated descendant of normal Earth rats. These ones seem particularly hungry, \
and are able to pounce and stun their targets - presumably to eat them. Their bodies are long and greyfurred, \
with a pink nose and large teeth, just like their regular-sized counterparts."
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/vore/aggressive/rat
name = "giant rat"
desc = "In what passes for a hierarchy among verminous rodents, this one is king."

View File

@@ -10,7 +10,9 @@ List of things solar grubs should be able to do:
/datum/category_item/catalogue/fauna/solargrub //TODO: VIRGO_LORE_WRITING_WIP
name = "Solargrub"
desc = ""
desc = "Some form of mutated space larva, they seem to crop up on space stations wherever there is power. \
They seem to have the chance to cocoon and mutate if left alone, but no recorded instances of this have happened yet. \
Therefore, if you see the grubs, kill them while they're small, or things might escalate." // TODO: PORT SOLAR MOTHS - Rykka
value = CATALOGUER_REWARD_EASY
#define SINK_POWER 1

View File

@@ -1,3 +1,10 @@
/datum/category_item/catalogue/fauna/wolf //TODO: VIRGO_LORE_WRITING_WIP
name = "Creature - Wolf"
desc = "Some sort of wolf, a descendent or otherwise of regular Earth canidae. They look almost exactly like their \
Earth counterparts, except for the fact that their fur is a uniform grey. Some do show signs of unique coloration, and they \
love to nip and bite at things, as well as sniffing around. They seem to mark their territory by way of scent-marking/urinating on things."
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/animal/wolf
name = "grey wolf"
desc = "My, what big jaws it has!"