mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Grep for space indentation (#54850)
#54604 atomizing Since a lot of the space indents are in lists ill atomize those later
This commit is contained in:
TiviPlus
@@ -1,12 +1,12 @@
|
||||
#define MAX_RADIUS_REQUIRED 20 //maxcap
|
||||
#define MIN_RADIUS_REQUIRED 4 //1, 2, 4
|
||||
/**
|
||||
* # Explosive compressor machines
|
||||
*
|
||||
* The explosive compressor machine used in anomaly core production.
|
||||
*
|
||||
* Uses the standard toxins/tank explosion scaling to compress raw anomaly cores into completed ones. The required explosion radius increases as more cores of that type are created.
|
||||
*/
|
||||
* # Explosive compressor machines
|
||||
*
|
||||
* The explosive compressor machine used in anomaly core production.
|
||||
*
|
||||
* Uses the standard toxins/tank explosion scaling to compress raw anomaly cores into completed ones. The required explosion radius increases as more cores of that type are created.
|
||||
*/
|
||||
/obj/machinery/research/explosive_compressor
|
||||
name = "implosion compressor"
|
||||
desc = "An advanced machine capable of implosion-compressing raw anomaly cores into finished artifacts."
|
||||
@@ -51,8 +51,8 @@
|
||||
inserted_core = null
|
||||
|
||||
/**
|
||||
* Says (no, literally) the data of required explosive power for a certain anomaly type.
|
||||
*/
|
||||
* Says (no, literally) the data of required explosive power for a certain anomaly type.
|
||||
*/
|
||||
/obj/machinery/research/explosive_compressor/proc/say_requirements(obj/item/raw_anomaly_core/C)
|
||||
var/required = get_required_radius(C.anomaly_type)
|
||||
if(isnull(required))
|
||||
@@ -61,13 +61,13 @@
|
||||
say("[C] requires a minimum of a theoretical radius of [required] to successfully implode into a charged anomaly core.")
|
||||
|
||||
/**
|
||||
* Determines how much explosive power (last value, so light impact theoretical radius) is required to make a certain anomaly type.
|
||||
*
|
||||
* Returns null if the max amount has already been reached.
|
||||
*
|
||||
* Arguments:
|
||||
* * anomaly_type - anomaly type define
|
||||
*/
|
||||
* Determines how much explosive power (last value, so light impact theoretical radius) is required to make a certain anomaly type.
|
||||
*
|
||||
* Returns null if the max amount has already been reached.
|
||||
*
|
||||
* Arguments:
|
||||
* * anomaly_type - anomaly type define
|
||||
*/
|
||||
/obj/machinery/research/explosive_compressor/proc/get_required_radius(anomaly_type)
|
||||
var/already_made = SSresearch.created_anomaly_types[anomaly_type]
|
||||
var/hard_limit = SSresearch.anomaly_hard_limit_by_type[anomaly_type]
|
||||
@@ -109,8 +109,8 @@
|
||||
do_implosion()
|
||||
|
||||
/**
|
||||
* The ""explosion"" proc.
|
||||
*/
|
||||
* The ""explosion"" proc.
|
||||
*/
|
||||
/obj/machinery/research/explosive_compressor/proc/do_implosion()
|
||||
var/required_radius = get_required_radius(inserted_core.anomaly_type)
|
||||
// By now, we should be sure that we have a core, a TTV, and that the TTV has both tanks in place.
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
/**
|
||||
* # Raw Anomaly Cores
|
||||
*
|
||||
* The current precursor to anomaly cores, these are manufactured into 'finished' anomaly cores for use in research, items, and more.
|
||||
*
|
||||
* The current amounts created is stored in `SSresearch.created_anomaly_types[ANOMALY_CORE_TYPE_DEFINE] = amount`.
|
||||
* The hard limits are in `code/__DEFINES/anomalies.dm`.
|
||||
*/
|
||||
* # Raw Anomaly Cores
|
||||
*
|
||||
* The current precursor to anomaly cores, these are manufactured into 'finished' anomaly cores for use in research, items, and more.
|
||||
*
|
||||
* The current amounts created is stored in `SSresearch.created_anomaly_types[ANOMALY_CORE_TYPE_DEFINE] = amount`.
|
||||
* The hard limits are in `code/__DEFINES/anomalies.dm`.
|
||||
*/
|
||||
/obj/item/raw_anomaly_core
|
||||
name = "raw anomaly core"
|
||||
desc = "You shouldn't be seeing this. Someone screwed up."
|
||||
@@ -57,13 +57,13 @@
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/**
|
||||
* Created the resulting core after being "made" into it.
|
||||
*
|
||||
* Arguments:
|
||||
* * newloc - Where the new core will be created
|
||||
* * del_self - should we qdel(src)
|
||||
* * count_towards_limit - should we increment the amount of created cores on SSresearch
|
||||
*/
|
||||
* Created the resulting core after being "made" into it.
|
||||
*
|
||||
* Arguments:
|
||||
* * newloc - Where the new core will be created
|
||||
* * del_self - should we qdel(src)
|
||||
* * count_towards_limit - should we increment the amount of created cores on SSresearch
|
||||
*/
|
||||
/obj/item/raw_anomaly_core/proc/create_core(newloc, del_self = FALSE, count_towards_limit = FALSE)
|
||||
. = new anomaly_type(newloc)
|
||||
if(count_towards_limit)
|
||||
|
||||
@@ -269,14 +269,14 @@
|
||||
trigger_cooldown = 5
|
||||
|
||||
var/list/static/allowed_species = list(
|
||||
"Human" = /datum/species/human,
|
||||
"Lizard" = /datum/species/lizard,
|
||||
"Human" = /datum/species/human,
|
||||
"Lizard" = /datum/species/lizard,
|
||||
"Moth" = /datum/species/moth,
|
||||
"Ethereal" = /datum/species/ethereal,
|
||||
"Pod" = /datum/species/pod,
|
||||
"Fly" = /datum/species/fly,
|
||||
"Felinid" = /datum/species/human/felinid,
|
||||
"Jelly" = /datum/species/jelly
|
||||
"Jelly" = /datum/species/jelly,
|
||||
)
|
||||
|
||||
/datum/nanite_program/sensor/species/register_extra_settings()
|
||||
|
||||
@@ -95,4 +95,4 @@
|
||||
return techweb_point_display_generic(get_price(TN))
|
||||
|
||||
/datum/techweb_node/proc/on_research() //new proc, not currently in file
|
||||
return
|
||||
return
|
||||
|
||||
@@ -54,9 +54,9 @@ Self-sustaining extracts:
|
||||
extract.reagents.add_reagent(secondary,amount)
|
||||
|
||||
/obj/item/autoslime/examine(mob/user)
|
||||
. = ..()
|
||||
if(effect_desc)
|
||||
. += "<span class='notice'>[effect_desc]</span>"
|
||||
. = ..()
|
||||
if(effect_desc)
|
||||
. += "<span class='notice'>[effect_desc]</span>"
|
||||
|
||||
//Different types.
|
||||
|
||||
|
||||
@@ -209,9 +209,10 @@
|
||||
required_reagents = list(/datum/reagent/consumable/nutriment/protein)
|
||||
|
||||
supplementary_reagents = list(
|
||||
/datum/reagent/toxin/slimejelly = 2,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/consumable/enzyme = 1)
|
||||
/datum/reagent/toxin/slimejelly = 2,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/consumable/enzyme = 1,
|
||||
)
|
||||
|
||||
suppressive_reagents = list(
|
||||
/datum/reagent/consumable/frostoil = -4,
|
||||
@@ -227,29 +228,33 @@
|
||||
required_reagents = list(/datum/reagent/consumable/nutriment/protein)
|
||||
|
||||
supplementary_reagents = list(
|
||||
/datum/reagent/consumable/nutriment/vitamin = 3,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/sulfur = 2)
|
||||
/datum/reagent/consumable/nutriment/vitamin = 3,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/sulfur = 2,
|
||||
)
|
||||
|
||||
suppressive_reagents = list(
|
||||
/datum/reagent/consumable/tinlux = -6,
|
||||
/datum/reagent/napalm = -4)
|
||||
/datum/reagent/consumable/tinlux = -6,
|
||||
/datum/reagent/napalm = -4,
|
||||
)
|
||||
virus_suspectibility = 0
|
||||
resulting_atoms = list(/mob/living/simple_animal/hostile/blob/blobspore/independent = 2) //These are useless so we might as well spawn 2.
|
||||
|
||||
/datum/micro_organism/cell_line/blobbernaut
|
||||
desc = "Blobular myocytes"
|
||||
required_reagents = list(
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/medicine/c2/synthflesh,
|
||||
/datum/reagent/sulfur) //grind flares to get this
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/medicine/c2/synthflesh,
|
||||
/datum/reagent/sulfur,
|
||||
) //grind flares to get this
|
||||
|
||||
supplementary_reagents = list(
|
||||
/datum/reagent/growthserum = 3,
|
||||
/datum/reagent/consumable/nutriment/vitamin = 2,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/consumable/eggyolk = 2,
|
||||
/datum/reagent/consumable/shamblers = 1)
|
||||
/datum/reagent/growthserum = 3,
|
||||
/datum/reagent/consumable/nutriment/vitamin = 2,
|
||||
/datum/reagent/liquidgibs = 2,
|
||||
/datum/reagent/consumable/eggyolk = 2,
|
||||
/datum/reagent/consumable/shamblers = 1,
|
||||
)
|
||||
|
||||
suppressive_reagents = list(/datum/reagent/consumable/tinlux = -6)
|
||||
|
||||
@@ -259,34 +264,38 @@
|
||||
/datum/micro_organism/cell_line/gelatinous_cube
|
||||
desc = "Cubic ooze particles"
|
||||
required_reagents = list(
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/toxin/slimejelly,
|
||||
/datum/reagent/yuck,
|
||||
/datum/reagent/consumable/enzyme) //Powerful enzymes helps the cube digest prey.
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/toxin/slimejelly,
|
||||
/datum/reagent/yuck,
|
||||
/datum/reagent/consumable/enzyme,
|
||||
) //Powerful enzymes helps the cube digest prey.
|
||||
|
||||
supplementary_reagents = list(
|
||||
/datum/reagent/water/hollowwater = 4,
|
||||
/datum/reagent/consumable/corn_syrup = 3,
|
||||
/datum/reagent/gold = 2, //This is why they eat so many adventurers.
|
||||
/datum/reagent/consumable/nutriment/peptides = 2,
|
||||
/datum/reagent/consumable/potato_juice = 1,
|
||||
/datum/reagent/liquidgibs = 1,
|
||||
/datum/reagent/consumable/nutriment/vitamin = 1)
|
||||
/datum/reagent/water/hollowwater = 4,
|
||||
/datum/reagent/consumable/corn_syrup = 3,
|
||||
/datum/reagent/gold = 2, //This is why they eat so many adventurers.
|
||||
/datum/reagent/consumable/nutriment/peptides = 2,
|
||||
/datum/reagent/consumable/potato_juice = 1,
|
||||
/datum/reagent/liquidgibs = 1,
|
||||
/datum/reagent/consumable/nutriment/vitamin = 1,
|
||||
)
|
||||
|
||||
suppressive_reagents = list(
|
||||
/datum/reagent/toxin/minttoxin = -3,
|
||||
/datum/reagent/consumable/frostoil = -2,
|
||||
/datum/reagent/consumable/ice = -1)
|
||||
/datum/reagent/toxin/minttoxin = -3,
|
||||
/datum/reagent/consumable/frostoil = -2,
|
||||
/datum/reagent/consumable/ice = -1,
|
||||
)
|
||||
virus_suspectibility = 0
|
||||
resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/gelatinous = 1)
|
||||
|
||||
/datum/micro_organism/cell_line/sholean_grapes
|
||||
desc = "Globular ooze particles"
|
||||
required_reagents = list(
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/toxin/slimejelly,
|
||||
/datum/reagent/yuck,
|
||||
/datum/reagent/consumable/vitfro)
|
||||
/datum/reagent/consumable/nutriment/protein,
|
||||
/datum/reagent/toxin/slimejelly,
|
||||
/datum/reagent/yuck,
|
||||
/datum/reagent/consumable/vitfro,
|
||||
)
|
||||
|
||||
supplementary_reagents = list(
|
||||
/datum/reagent/medicine/omnizine = 4,
|
||||
|
||||
Reference in New Issue
Block a user