mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 14:31:59 +01:00
Expedition Fluff Expansion - Stasis cages, Safari Nets & Sampling Tools (#19365)
Ports stasis cages from Baystation, for storage and transport of simple mobs. These mobs must first be caught in an energy net, and this adds a weaker energy net variant (safari net) as well as a way to transport them and a dispenser for them in xenobiology. Adds science samplers, available to every science role (lockers or xenobiology lab due to xenobiology not having lockers). These must be loaded with vials, and can then be used to extract plant/animal tissue samples, soil samples or water samples. Added a low power microscope, as well as a centrifuge and spectrophotometer, for analysing each of those sample types respectively. Note: The fluff text for tissue samples at the moment has more detail for common mobs, such as carp or greimorians, and Moghes mobs as they are the most prevalent right now. I'm not great at writing, so I'd encourage others who are to add more descriptions over time. Microscope & Net Dispenser in Xenobiology  Sampler + Tissue/Soil/Water attachments    Net Container  Microscope, Centrifuge and Spectrophotometer in R&D  Stasis Cages  ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | icons/obj/machinery/stasis_cage.dmi | mustafakalash (Baystation12) | CC BY-SA 3.0 | --------- Signed-off-by: Sparky. <ben.polwart@gmail.com> Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it> Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This commit is contained in:
Sparky
@@ -6,6 +6,14 @@
|
||||
var/cutting
|
||||
/// Whether or not you can shelter under this.
|
||||
var/protects_against_weather = FALSE
|
||||
/**
|
||||
* List of fluff characteristics to be found on cellular/soil analysis
|
||||
*/
|
||||
var/list/sample_data = list("Cellular structure typical of wild plantlife")
|
||||
/**
|
||||
* Whether this is actually a rock
|
||||
*/
|
||||
var/is_rock = FALSE
|
||||
|
||||
/obj/structure/flora/proc/dig_up(mob/user)
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins digging up \the [src]..."))
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
desc = "A rock."
|
||||
icon = 'icons/obj/flora/rocks_grey.dmi'
|
||||
icon_state = "basalt"
|
||||
is_rock = TRUE
|
||||
sample_data = list("Sample contains igneous rock dust")
|
||||
|
||||
/obj/structure/flora/rock/random/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -22,6 +24,7 @@
|
||||
desc = "A large formation made of ice."
|
||||
icon = 'icons/obj/flora/ice_rocks.dmi'
|
||||
icon_state = "rock_1"
|
||||
sample_data = list("Sample contains ice crystals")
|
||||
|
||||
/obj/structure/flora/rock/ice/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
layer = 9
|
||||
pixel_x = -16
|
||||
protects_against_weather = TRUE
|
||||
sample_data = list("Cellular structure indicitive of large plantlife.")
|
||||
var/max_chop_health = 180
|
||||
var/chop_health = 180 //15 hits with steel hatchet, 5 with wielded fireaxe
|
||||
var/fall_force = 60
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
pixel_x = -32
|
||||
icon = 'icons/obj/flora/crystal_trees.dmi'
|
||||
icon_state = "gem"
|
||||
is_rock = TRUE
|
||||
sample_data = list("Sample contains crystaline structures with a branching fractal appearance")
|
||||
|
||||
/obj/structure/flora/tree/crystal/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -19,6 +21,7 @@
|
||||
icon_state = "spire"
|
||||
pixel_x = -32
|
||||
layer = ABOVE_HUMAN_LAYER // this is basically a tree
|
||||
sample_data = list("Sample contains low density crystaline structures")
|
||||
|
||||
/obj/structure/flora/rock/spire/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
icon = 'icons/obj/flora/desert_cactus_trees.dmi'
|
||||
icon_state = "desert_tree"
|
||||
desc = "A prickly cactus with a woody trunk."
|
||||
sample_data = list("Cells contain above average water storage, indicating adaptation for a dry environment")
|
||||
|
||||
/obj/structure/flora/tree/desert/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -34,6 +35,7 @@
|
||||
desc = "A sand-swept rock."
|
||||
icon = 'icons/obj/flora/desertflora.dmi'
|
||||
icon_state = "desert_rock"
|
||||
sample_data = list("Sample contains sedimentary rock dust")
|
||||
|
||||
/obj/structure/flora/rock/desert/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
desc = "Some sort of woody fungal growth, grown to extreme proportions."
|
||||
icon = 'icons/obj/flora/fungaltrees.dmi'
|
||||
icon_state = "shroom"
|
||||
sample_data = list("Cells appear fungal in nature")
|
||||
|
||||
/obj/structure/flora/tree/mushroom/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -16,6 +17,7 @@
|
||||
desc = "A rather large variety of fungus."
|
||||
icon = 'icons/obj/flora/fungalflora.dmi'
|
||||
icon_state = "fungus_bush"
|
||||
sample_data = list("Cells appear fungal in nature")
|
||||
|
||||
/obj/structure/flora/bush/mushroom/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -253,6 +253,10 @@ var/global/area/overmap/map_overmap
|
||||
/// Lore planets and static away sites that are planets should keep it to static text trivia.
|
||||
/// For random planets, should be filled with random trivia or blurbs or the like.
|
||||
var/ground_survey_result = null
|
||||
/// Fluff descriptions found from soil sampling
|
||||
var/list/soil_data = list()
|
||||
/// Fluff desctiptions found on water sampling
|
||||
var/list/water_data = list()
|
||||
/// Magnetic survey result for use by survey probes. Randomly generated by most planets. Lore planets should have static text.
|
||||
var/magnet_survey_result = null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user