diff --git a/code/modules/catalogue/cataloguer_vr.dm b/code/modules/catalogue/cataloguer_vr.dm index 8a8322c581..6759cca651 100644 --- a/code/modules/catalogue/cataloguer_vr.dm +++ b/code/modules/catalogue/cataloguer_vr.dm @@ -3,8 +3,10 @@ /obj/item/device/cataloguer/compact name = "compact cataloguer" - icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "tricorder" + desc = "A compact hand-held device, used for compiling information about an object by scanning it. \ + Alt+click to highlight scannable objects around you." + icon = 'icons/obj/device_vr.dmi' + icon_state = "compact" action_button_name = "Toggle Cataloguer" var/deployed = TRUE scan_range = 1 @@ -30,7 +32,7 @@ if(deployed) w_class = ITEMSIZE_NORMAL icon_state = "[initial(icon_state)]" - to_chat(usr, span("notice", "You flip open \the [src].")) + to_chat(usr, span("notice", "You flick open \the [src].")) else w_class = ITEMSIZE_SMALL icon_state = "[initial(icon_state)]_closed" @@ -54,6 +56,15 @@ /obj/item/device/cataloguer/compact/pathfinder name = "pathfinder's cataloguer" - icon_state = "tricorder_med" + desc = "A compact hand-held device, used for compiling information about an object by scanning it. \ + Alt+click to highlight scannable objects around you." + icon = 'icons/obj/device_vr.dmi' + icon_state = "pathcat" scan_range = 3 toolspeed = 1 + +/obj/item/device/cataloguer + desc = "A hand-held device, used for compiling information about an object by scanning it. \ + Alt+click to highlight scannable objects around you." + icon = 'icons/obj/device_vr.dmi' + icon_state = "cataloguer" \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index 903f4b9ce6..c30dd4be5a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -1,6 +1,24 @@ +/datum/category_item/catalogue/fauna/snake + name = "Wildlife - Snake" + desc = "Classification: Reptilia Serpentes\ +

\ + Snakes are elongated, limbless, carnivorous reptiles of the suborder Serpentes \ + Like all other squamates, snakes are ectothermic, amniote vertebrates covered in overlapping scales. \ + Many species of snakes have skulls with several more joints than their lizard ancestors, \ + enabling them to swallow prey much larger than their heads with their highly mobile jaws. \ +
\ + This species of snake is nonvenomous and use their large bodies to primarily subdue their prey. \ + Nonvenomous snakes either swallow prey alive or kill them by constriction - this is dependant on the prey. \ +
\ + This specific snake is nonvenomous and is mostly passive - however they will attack if threatened - it is \ + recommended that persons keep their distance as to not provoke these animals." + value = CATALOGUER_REWARD_TRIVIAL + /mob/living/simple_mob/animal/passive/snake name = "snake" desc = "A big thick snake." + tt_desc = "Reptilia Serpentes" + catalogue_data = list(/datum/category_item/catalogue/fauna/snake) icon_state = "snake" icon_living = "snake" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index d419bdd2bd..1f848b1be1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -1,13 +1,28 @@ -/datum/category_item/catalogue/fauna/deathclaw //TODO: VIRGO_LORE_WRITING_WIP +/datum/category_item/catalogue/fauna/deathclaw 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." + desc = "Classification: Trioceros dominus\ +

\ + Originally the deathclaw was a top secret genetics project that was run by ancestral zorren. \ + While it is not immediately evident in their body structure, these creatures bare a \ + subtle genetic connection to Zorren, however, this connection is marred by the other genes that \ + have been grafted onto the DNA strucutre of the Deathclaw. The creatures are known to attack humans \ + and other animals regularly to protect their territory or to hunt for food. It is speculated that \ + they escaped roughly around the time as whatever calamity befell the zorren many centuries ago \ + as sighting of these beasts in the wild began around that time according to recovered zorren texts. \ +
\ + Deathclaws are a large, carnivorous, bipedal reptile species, designed for maximum lethality. \ + Deathclaws are made even more dangerous by their reproductive instincts. deathclaws are an oviparous species, \ + female deathclaws will lay eggs in clusters, sired by the strongest male deathclaws in the pack, typically the alpha male.\ +
\ + These creatures are considered an invasive species, and thus hunters are encouraged to hunt them \ + although they are cautioned when doing so due to the danger that the creature poses." //CHOMPedit 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!" + tt_desc = "Trioceros dominus" + catalogue_data = list(/datum/category_item/catalogue/fauna/deathclaw) icon_dead = "deathclaw-dead" icon_living = "deathclaw" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm index c35e421fab..c9a9696c99 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm @@ -1,15 +1,29 @@ -/datum/category_item/catalogue/fauna/fennec //TODO: VIRGO_LORE_WRITING_WIP +/datum/category_item/catalogue/fauna/fennec 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." + desc = "Classification: Vulpes zerda maxima\ +

\ + The fennec fox is a small crepuscular fox native to Earth in Sol that nearly went extinct in the 2030s.\ + Through conservation efforts and the rise of space colonies, the Fennec was brought back from the brink \ + and is now labeled as 'Least Concern'. During the expansionist periods, fennecs were brought with \ + colonists as a means of companionship and as a ecosystem modifier for desert worlds. \ + Virgo 4 fennecs are upwards of five times larger than their Sol cousins and consequently \ + have a larger appetite. Their diet mainly consists of whatever small creatures that they manage to scrounge from \ + the sands of Virgo 4, however they have been known to hunt larger prey in desperate times.\ +
\ + Fennec foxes reach sexual maturity at around nine months and mate between January and April \ + They usually breed only once per year. After mating, the male becomes very aggressive and protects \ + the female, provides her with food during pregnancy and lactation.\ +
\ + Virgo fennecs have been observed to be passive and do not actively hunt large prey as their bodies have \ + grown accustomed to less available food sources. However, travellers are still cautioned on approaching \ + them as Virgo Fennec have been known to swallow prey whole depending on the prey's size." //CHOMPedit 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!" - tt_desc = "Vulpes zerda" + tt_desc = "Vulpes zerda maxima" + catalogue_data = list(/datum/category_item/catalogue/fauna/fennec) icon_state = "fennec" icon_living = "fennec" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm index 9e1609336d..a3d1c331a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm @@ -1,7 +1,27 @@ +/datum/category_item/catalogue/fauna/frog + name = "Wildlife - Giant Frog" + desc = "Classification: Anura gigantus\ +

\ + A frog is any member of a diverse and largely carnivorous group of short-bodied, tailless amphibians composing \ + the order Anura. This specific species - Anura gigantus - is a mutated form of frogs, largely due to exposure to mutagen chemicals. \ + These giant frogs are descendants from scientific frogs that were used for study during the great Sol Expansion Period. \ + Modern day giant frogs have reverted to a more feral state compared to their original ancestors and are hostile \ + towards humans and other small wildlife - hunting them for food.\ +
\ + The particular breed of frog that was originally used in the scientific experiments were known as explosive breeders.\ + With explosive breeders, mature adult frogs arrive at breeding sites in response to certain trigger factors such as rainfall \ + occurring in an arid area. In these frogs, mating and spawning take place promptly and the speed of larval growth is rapid in \ + order to make use of the ephemeral pools before they dry up. Because of this, the frog population is through the roof and has \ + become a major issue for various colonies and stations.\ +
\ + These animals, are considered an invasive species, and thus hunters are encouraged to hunt them." //CHOMPedit + value = CATALOGUER_REWARD_TRIVIAL + /mob/living/simple_mob/vore/aggressive/frog name = "giant frog" desc = "You've heard of having a frog in your throat, now get ready for the reverse." tt_desc = "Anura gigantus" + catalogue_data = list(/datum/category_item/catalogue/fauna/frog) icon_dead = "frog-dead" icon_living = "frog" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm index 5307a05cd0..a78e499a85 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm @@ -1,8 +1,18 @@ -/datum/category_item/catalogue/fauna/mimic //TODO: VIRGO_LORE_WRITING_WIP +/datum/category_item/catalogue/fauna/mimic 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." + desc = "Classification: Mimus vorare\ +

\ + Mimics are morph creatures that share properties with the likes of prometheans. They can assume any shape, \ + provided that they retain the same volume. In order to most effectively lure prey, they most commonly \ + take the shape of chests and other objects likely to be touched by someone - though the latter is rarer \ + than the former. \ +
\ + Mimics prefer consuming large prey such as humans or humanoid species, however, for means of survival they \ + might resort to eating smaller prey. A meal of one or two humanoids could sustain a mimic for several \ + months at a time - the main reason that they prey on humanoids to begin with. They reproduce asexually \ + by splitting their mass, the young growing to adulthood within a few years time.\ +
\ + Mimics have no concerns beyond surviving and acquiring food." //CHOMPedit value = CATALOGUER_REWARD_HARD /obj/structure/closet/crate/mimic @@ -63,9 +73,11 @@ /mob/living/simple_mob/vore/aggressive/mimic name = "crate" desc = "A rectangular steel crate." + + icon_state = "crate" icon_living = "crate" - icon = 'icons/obj/storage_vr.dmi' + icon = 'icons/obj/storage.dmi' faction = "mimic" @@ -101,6 +113,8 @@ showvoreprefs = 0 //Hides mechanical vore prefs for mimics. You can't see their gaping maws when they're just sitting idle. /mob/living/simple_mob/vore/aggressive/mimic + tt_desc = "Mimus vorare" + catalogue_data = list(/datum/category_item/catalogue/fauna/mimic) vore_active = 1 vore_pounce_chance = 10 swallowTime = 3 SECONDS diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 67194a3a87..22481cf405 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -1,14 +1,28 @@ -/datum/category_item/catalogue/fauna/rat //TODO: VIRGO_LORE_WRITING_WIP +/datum/category_item/catalogue/fauna/rat 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." + desc = "Classification: Mus muscular\ +

\ + Rats are various medium-sized, long-tailed rodents. Species of rats are found throughout the order Rodentia, \ + but stereotypical rats are found in the genus Rattus. This specific species of rat is a mutated descendant from lab rats. \ + It is unclear what experiment caused this species to grow to such an unnatural size, however it hasn't affected the rat's \ + general docile nature. When encountered by humans or other species it generally ignores them unless provoked.\ +
\ + Rats become sexually mature at age 6 weeks, but reach social maturity at about 5 to 6 months of age. \ + The average lifespan of rats varies by species, but many only live about a year due to predation. \ + However, due to the large nature of this particular species of rat, predation is usually not that much of an issue. \ + This doesn't mean that there is an overpopulation, though, quite the opposite. Giant Rats are rare and this is usually \ + due to small litter sizes and lack of proper food sources. Areas that one would typically see a Giant Rat is large garbage \ + disposals or areas that have large amounts of live food (other rats, mice, etc.) such as maintenance tunnels. \ +
\ + Male rats are called bucks; unmated females, does, pregnant or parent females, dams; and infants, kittens or pups. \ + A group of rats is referred to as a mischief." 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." tt_desc = "Mus muscular" + catalogue_data = list(/datum/category_item/catalogue/fauna/rat) icon_state = "rous" icon_living = "rous" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm index 619e0acad0..00378ac847 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm @@ -1,12 +1,28 @@ /datum/category_item/catalogue/fauna/sect_drone name = "Creature - Sect Drone" - desc = "Database Update Pending" //TODO: Virgo Lore Writing WIP + desc = "Classification: V Insecta gigantus\ +

\ + A massively-sized insect that is native to Virgo 3B. Much like its queen, it bears the combined physical traits \ + of several of Earth's insects. Its forelegs have claws bearing serrated edges much like a mantis, which it uses \ + in both self-defense and during its hunts. On the back are two large semi transparent wings like a beetle which \ + are used for increased mobility. Covering the body is a layer of light, thick, and protective chitin, resilient enough to absorb \ + most physical damage while being light enough for the sect drone to hover. \ +
\ + It is not uncommon for a sect drone to go out alone to search for potential prey to bring back to the nest. \ + Regardless of reason, it is cautioned against approaching a sect drone as, like the queen, their behaviour is wildly \ + inconsistent. A sect drone can vary from hostile to docile depending on certain factors that scientists have \ + yet to uncover. \ +
\ + The lack of chitin on the underside of its abdomen is very elastic and stretchable, \ + allowing the drone to carry multiple large prey inside of its stomach with relative ease." //CHOMPedit value = CATALOGUER_REWARD_MEDIUM /mob/living/simple_mob/vore/sect_drone name = "sect drone" desc = "A large, chitin-plated insectoid whose multiple cyan eyes cast a frightful blue light. Its \ abdomen has an unusually soft and... flexible-looking underbelly..." + tt_desc = "V Insecta gigantus" + catalogue_data = list(/datum/category_item/catalogue/fauna/sect_drone) icon_dead = "sect_drone_dead" icon_living = "sect_drone" @@ -64,4 +80,4 @@ say_list_type = /datum/say_list/sect_drone /datum/say_list/sect_drone - say_got_target = list("chitters threateningly!") \ No newline at end of file + say_got_target = list("chitters threateningly!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm index bb0933dd86..bc4a670091 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm @@ -2,20 +2,30 @@ /datum/category_item/catalogue/fauna/sect_queen name = "Creature - Sect Queen" - desc = "A massively-sized insect that is native, although rarely spotted outside of its colony, to Virgo 3B. \ + desc = "Classification: V Insecta maximus gigantus\ +

\ + A massively-sized insect that is native - although rarely spotted outside of the colony - to Virgo 3B. \ It bears the combined physical traits of several of Earth's insects. Its forelegs have claws bearing serrated \ - edges, which it uses in both self-defense and during its hunts. Covering its body is a layer of thick and \ - protective chitin, resilient enough to absorb most physical damage. It is not uncommon for a queen to go out \ - alone to search for potential new nesting grounds... or perhaps it does so to seek bigger prey that its much \ - smaller drones might be unable to acquire. The lack of chitin on the underside of its abdomen is deliberate, \ - as the flesh is very elastic and stretchable, allowing the queen to carry multiple large prey inside of its \ - stomach with ease." + edges much like a mantis, which it uses in both self-defense and during its hunts. Covering its body is a layer \ + of thick and protective chitin, resilient enough to absorb most physical damage. \ +
\ + Though rarely seen, it is not uncommon for a queen to go out alone to search for potential new nesting grounds \ + or perhaps it does so to seek bigger prey that its much smaller drones might be unable to acquire. \ + Regardless of reason, it is cautioned against approaching a Sect Queen as their behaviour is wildly \ + inconsistent. A sect queen can vary from hostile to docile depending on certain factors that scientists have \ + yet to uncover. \ +
\ + The lack flesh on the underside of its abdomen is very elastic and stretchable, \ + allowing the queen to carry multiple large prey inside of its stomach with ease. There is no know limit to home much \ + prey a single specimen can carry and scientists are wary to find said limit." //CHOMPedit value = CATALOGUER_REWARD_MEDIUM /mob/living/simple_mob/vore/sect_queen name = "sect queen" desc = "A titanic, chitin-plated insectoid whose multiple crimson eyes cast a frightful red light. Its \ abdomen has an unusually soft and... flexible-looking underbelly..." + tt_desc = "V Insecta maximus gigantus" + catalogue_data = list(/datum/category_item/catalogue/fauna/sect_queen) icon_dead = "sect_queen_dead" icon_living = "sect_queen" @@ -72,4 +82,4 @@ say_list_type = /datum/say_list/sect_queen /datum/say_list/sect_queen - say_got_target = list("chitters angrily!") \ No newline at end of file + say_got_target = list("chitters angrily!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm index 1bec4badf9..600fb6fd53 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm @@ -1,6 +1,29 @@ +/datum/category_item/catalogue/fauna/giant_snake + name = "Creature - Giant Snake" + desc = "Classification: Serpentes gigantus\ +

\ + Snakes are elongated, limbless, carnivorous reptiles of the suborder Serpentes \ + Like all other squamates, snakes are ectothermic, amniote vertebrates covered in overlapping scales. \ + Many species of snakes have skulls with several more joints than their lizard ancestors, \ + enabling them to swallow prey much larger than their heads with their highly mobile jaws. \ + This particular species of snake has likely been mutated by deliberate gene manipulation of some sort and as a \ + result has grown to unnatural size. Biologically this snake is no different than that of the common snake, \ + but this species has been known to have increased hostility towards wildlife. Scientists are still studying \ + this new species for any differences in behavior or biology beyond the increase in size. \ +
\ + This species of snake is nonvenomous and use their large bodies to primarily subdue their prey. \ + Nonvenomous snakes either swallow prey alive or kill them by constriction - this is dependant on the prey. \ +
\ + This snake is extremely hostile to all wildlife and living beings and should be avoided at all costs. \ + People who spot these creatures are urged to inform the nearest militant entity so that they can be \ + dealt with in a professional manner." + value = CATALOGUER_REWARD_HARD + /mob/living/simple_mob/vore/aggressive/giant_snake name = "giant snake" desc = "Snakes. Why did it have to be snakes?" + tt_desc = "Serpentes gigantus" + catalogue_data = list(/datum/category_item/catalogue/fauna/giant_snake) icon_dead = "snake-dead" icon_living = "snake" diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi index e349085e63..41394a32c8 100644 Binary files a/icons/mob/vore64x64.dmi and b/icons/mob/vore64x64.dmi differ diff --git a/icons/obj/device_vr.dmi b/icons/obj/device_vr.dmi index 1fa6835a94..200443e046 100644 Binary files a/icons/obj/device_vr.dmi and b/icons/obj/device_vr.dmi differ