[MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)

* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-15 15:32:02 +00:00
committed by GitHub
co-authored by Mothblocks Gandalf2k15
parent 7635f198f4
commit b332b46b65
893 changed files with 6616 additions and 6605 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
splash_holder.chem_temp = (total_temp/reactants.len) + extra_heat // Average temperature of reagents + extra heat.
splash_holder.handle_reactions() // React them now.
if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around.
if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around.
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
steam.set_up(10, 0, epicenter)
steam.attach(epicenter)
@@ -194,7 +194,7 @@
if(time_deficit < 0.25)
delta_time += time_deficit
time_deficit = 0
else
else
delta_time += 0.25
time_deficit = 0.25
return delta_time
@@ -250,7 +250,7 @@
return
if(!calculate_yield())//So that this can detect if we're missing reagents
to_delete = TRUE
return
return
delta_time = deal_with_time(delta_time)
delta_t = 0 //how far off optimal temp we care
@@ -267,7 +267,7 @@
//Lower range
else if (cached_ph < reaction.optimal_ph_min) //If we're outside of the optimal lower bound
if (cached_ph < (reaction.optimal_ph_min - reaction.determin_ph_range)) //If we're outside of the deterministic bound
delta_ph = 0 //0% purity
delta_ph = 0 //0% purity
else //We're in the deterministic phase
delta_ph = (((cached_ph - (reaction.optimal_ph_min - reaction.determin_ph_range))**reaction.ph_exponent_factor)/((reaction.determin_ph_range**reaction.ph_exponent_factor))) //main pH calculation
//Upper range
+5 -5
View File
@@ -292,7 +292,7 @@
else
if(istype(R, reagent_type))
matches = 1
// We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type.
// We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type.
if(matches)
// Have our other proc handle removement
has_removed_reagent = remove_reagent(R.type, amount, safety)
@@ -953,7 +953,7 @@
var/reaction_message = equilibrium.reaction.mix_message
if(equilibrium.reaction.mix_sound)
playsound(get_turf(my_atom), equilibrium.reaction.mix_sound, 80, TRUE)
qdel(equilibrium)
qdel(equilibrium)
update_total()
SEND_SIGNAL(src, COMSIG_REAGENTS_REACTED, .)
return reaction_message
@@ -1348,7 +1348,7 @@
/// Returns the total heat capacity for all of the reagents currently in this holder.
/datum/reagents/proc/heat_capacity()
. = 0
var/list/cached_reagents = reagent_list //cache reagents
var/list/cached_reagents = reagent_list //cache reagents
for(var/I in cached_reagents)
var/datum/reagent/R = I
. += R.specific_heat * R.volume
@@ -1363,7 +1363,7 @@
/datum/reagents/proc/adjust_thermal_energy(delta_energy, min_temp = 2.7, max_temp = 1000)
var/heat_capacity = heat_capacity()
if(!heat_capacity)
return // no div/0 please
return // no div/0 please
set_temperature(clamp(chem_temp + (delta_energy / heat_capacity), min_temp, max_temp))
/// Applies heat to this holder
@@ -1492,7 +1492,7 @@
reagents = new /datum/reagents(max_vol, flags)
reagents.my_atom = src
/proc/get_random_reagent_id() // Returns a random reagent ID minus blacklisted reagents
/proc/get_random_reagent_id() // Returns a random reagent ID minus blacklisted reagents
var/static/list/random_reagents = list()
if(!random_reagents.len)
for(var/thing in subtypesof(/datum/reagent))
@@ -109,7 +109,7 @@
if(beaker?.reagents.chem_temp > 374)//If they heated it up as asked
tutorial_state = TUT_IS_ACTIVE
target_temperature = 375
beaker.reagents.chem_temp = 375
beaker.reagents.chem_temp = 375
if(TUT_IS_ACTIVE)
if(!(beaker?.reagents.has_reagent(/datum/reagent/mercury)) || !(beaker?.reagents.has_reagent(/datum/reagent/chlorine))) //Slightly concerned that people might take ages to read and it'll react anyways
@@ -299,12 +299,12 @@
if(TUT_NO_BUFFER)//missing buffer
data["tutorialMessage"] = {"It looks like youre a little low on buffers, heres how to make more:
Acidic buffer: 2 parts Sodium
Acidic buffer: 2 parts Sodium
2 parts Hydrogen
2 parts Ethanol
2 parts Water
Basic buffer: 3 parts Ammonia
Basic buffer: 3 parts Ammonia
2 parts Chlorine
2 parts Hydrogen
2 parts Oxygen
@@ -484,18 +484,18 @@
* Uses typelist() for styles storage after initialization.
* For fallback style must provide style with key (const) CONDIMASTER_STYLE_FALLBACK
* Returns list(
* <key> = list(
* "icon_state" = <bottle icon_state>,
* "name" = <bottle name>,
* "desc" = <bottle desc>,
* ?"generate_name" = <if truthy, autogenerates default name from reagents instead of using "name">,
* ?"icon_empty" = <icon_state when empty>,
* ?"fill_icon_thresholds" = <list of thresholds for reagentfillings, no tresholds if not provided or falsy>,
* ?"inhand_icon_state" = <inhand icon_state, falsy - no icon, not provided - whatever is initial (currently "beer")>,
* ?"lefthand_file" = <file for inhand icon for left hand, ignored if "inhand_icon_state" not provided>,
* ?"righthand_file" = <same as "lefthand_file" but for right hand>,
* ),
* ..
* <key> = list(
* "icon_state" = <bottle icon_state>,
* "name" = <bottle name>,
* "desc" = <bottle desc>,
* ?"generate_name" = <if truthy, autogenerates default name from reagents instead of using "name">,
* ?"icon_empty" = <icon_state when empty>,
* ?"fill_icon_thresholds" = <list of thresholds for reagentfillings, no tresholds if not provided or falsy>,
* ?"inhand_icon_state" = <inhand icon_state, falsy - no icon, not provided - whatever is initial (currently "beer")>,
* ?"lefthand_file" = <file for inhand icon for left hand, ignored if "inhand_icon_state" not provided>,
* ?"righthand_file" = <same as "lefthand_file" but for right hand>,
* ),
* ..
* )
*
*/
+1 -1
View File
@@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
var/impure_chem = /datum/reagent/impurity
/// If the impurity is below 0.5, replace ALL of the chem with inverse_chem upon metabolising
var/inverse_chem_val = 0.25
/// What chem is metabolised when purity is below inverse_chem_val
/// What chem is metabolised when purity is below inverse_chem_val
var/inverse_chem = /datum/reagent/impurity/toxic
///what chem is made at the end of a reaction IF the purity is below the recipies purity_min at the END of a reaction only
var/failed_chem = /datum/reagent/consumable/failed_reaction
@@ -82,7 +82,7 @@
/datum/reagent/medicine/c2/libital //messes with your liber
name = "Libital"
description = "A bruise reliever. Does minor liver damage."
color = "#ECEC8D" // rgb: 236 236 141
color = "#ECEC8D" // rgb: 236 236 141
taste_description = "bitter with a hint of alcohol"
reagent_state = SOLID
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -218,7 +218,7 @@
/******OXY******/
/*Suffix: -mol*/
#define CONVERMOL_RATIO 5 //# Oxygen damage to result in 1 tox
#define CONVERMOL_RATIO 5 //# Oxygen damage to result in 1 tox
/datum/reagent/medicine/c2/convermol
name = "Convermol"
@@ -244,7 +244,7 @@
..()
return TRUE
#undef CONVERMOL_RATIO
#undef CONVERMOL_RATIO
/datum/reagent/medicine/c2/tirimol
name = "Tirimol"
@@ -340,7 +340,7 @@
. = ..()
mytray.adjustToxic(-round(chems.get_reagent_amount(type) * 2))
#define issyrinormusc(A) (istype(A,/datum/reagent/medicine/c2/syriniver) || istype(A,/datum/reagent/medicine/c2/musiver)) //musc is metab of syrin so let's make sure we're not purging either
#define issyrinormusc(A) (istype(A,/datum/reagent/medicine/c2/syriniver) || istype(A,/datum/reagent/medicine/c2/musiver)) //musc is metab of syrin so let's make sure we're not purging either
/datum/reagent/medicine/c2/syriniver //Inject >> SYRINge
name = "Syriniver"
@@ -357,7 +357,7 @@
return
var/mob/living/carbon/C = A
if(trans_volume >= 0.6) //prevents cheesing with ultralow doses.
C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0) //This is to promote iv pole use for that chemotherapy feel.
C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0) //This is to promote iv pole use for that chemotherapy feel.
var/obj/item/organ/liver/L = C.internal_organs_slot[ORGAN_SLOT_LIVER]
if((L.organ_flags & ORGAN_FAILING) || !L)
return
@@ -4,7 +4,7 @@
// Part of the food code. Also is where all the food
// condiments, additives, and such go.
// condiments, additives, and such go.
/datum/reagent/consumable
@@ -12,7 +12,7 @@
taste_description = "generic food"
taste_mult = 4
var/nutriment_factor = 1 * REAGENTS_METABOLISM
var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes
var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes
impure_chem = /datum/reagent/water
inverse_chem_val = 0.1
inverse_chem = /datum/reagent/water
@@ -687,7 +687,7 @@
if(!(methods & INGEST) || !((methods & (TOUCH|PATCH|VAPOR)) && (exposed_mob.is_mouth_covered() || exposed_mob.is_eyes_covered())))
return
if(!exposed_mob.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes
if(!exposed_mob.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes
to_chat(exposed_mob, "<span class='notice'>Your eye sockets feel wet.</span>")
else
if(!exposed_mob.eye_blurry)
@@ -697,7 +697,7 @@
/datum/reagent/consumable/tearjuice/on_mob_life(mob/living/carbon/M)
..()
if(M.eye_blurry) //Don't worsen vision if it was otherwise fine
if(M.eye_blurry) //Don't worsen vision if it was otherwise fine
M.blur_eyes(4)
if(prob(10))
to_chat(M, "<span class='warning'>Your eyes sting!</span>")
@@ -54,7 +54,7 @@
switch(rand(100))
if(66 to 100)
mytray.mutatespecie()
if(33 to 65)
if(33 to 65)
mytray.mutateweed()
if(1 to 32)
mytray.mutatepest(user)
@@ -303,7 +303,7 @@
overdose_threshold = 60
taste_description = "sweetness and salt"
var/last_added = 0
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick
ph = 5.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -312,7 +312,7 @@
if(last_added)
M.blood_volume -= last_added
last_added = 0
if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level.
if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level.
var/amount_to_add = min(M.blood_volume, volume*5)
var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable)
last_added = new_blood_level - M.blood_volume
@@ -146,7 +146,7 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/*
* Water reaction to turf
* Water reaction to turf
*/
/datum/reagent/water/expose_turf(turf/open/exposed_turf, reac_volume)
@@ -170,7 +170,7 @@
qdel(hotspot)
/*
* Water reaction to an object
* Water reaction to an object
*/
/datum/reagent/water/expose_obj(obj/exposed_obj, reac_volume)
@@ -193,7 +193,7 @@
qdel(HH)
/*
* Water reaction to a mob
* Water reaction to a mob
*/
/datum/reagent/water/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with water can help put them out!
@@ -249,7 +249,7 @@
to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
qdel(BS)
if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(!M.stuttering)
M.stuttering = 1
M.stuttering = min(M.stuttering+4, 10)
@@ -261,14 +261,14 @@
M.Unconscious(120)
to_chat(M, "<span class='cultlarge'>[pick("Your blood is your bond - you are nothing without it", "Do not forget your place", \
"All that power, and you still fail?", "If you cannot scour this poison, I shall scour your meager life!")].</span>")
if(data["misc"] >= 60) // 30 units, 135 seconds
if(data["misc"] >= 60) // 30 units, 135 seconds
if(iscultist(M))
SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
M.jitteriness = 0
M.stuttering = 0
holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
return
holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack
holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack
/datum/reagent/water/holywater/expose_turf(turf/exposed_turf, reac_volume)
. = ..()
@@ -308,7 +308,7 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/*
* Water reaction to turf
* Water reaction to turf
*/
/datum/reagent/hydrogen_peroxide/expose_turf(turf/open/exposed_turf, reac_volume)
@@ -318,7 +318,7 @@
if(reac_volume >= 5)
exposed_turf.MakeSlippery(TURF_WET_WATER, 10 SECONDS, min(reac_volume*1.5 SECONDS, 60 SECONDS))
/*
* Water reaction to a mob
* Water reaction to a mob
*/
/datum/reagent/hydrogen_peroxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with h2o2 can burn them !
@@ -326,7 +326,7 @@
if(methods & TOUCH)
exposed_mob.adjustFireLoss(2, 0) // burns
/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
name = "Unholy Water"
description = "Something that shouldn't exist on this plane of existence."
taste_description = "suffering"
@@ -354,7 +354,7 @@
M.adjustBruteLoss(2, 0)
..()
/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
name = "Hell Water"
description = "YOUR FLESH! IT BURNS!"
taste_description = "burning"
@@ -363,9 +363,9 @@
/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
M.set_fire_stacks(min(5, M.fire_stacks + 3))
M.IgniteMob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire
M.IgniteMob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire
M.adjustToxLoss(1, 0)
M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
holder.remove_reagent(type, 1)
@@ -451,15 +451,15 @@
if(48)
newcolor += "0"
if(49 to 57)
newcolor += ascii2text(ascii-1) //numbers 1 to 9
newcolor += ascii2text(ascii-1) //numbers 1 to 9
if(97)
newcolor += "9"
if(98 to 102)
newcolor += ascii2text(ascii-1) //letters b to f lowercase
newcolor += ascii2text(ascii-1) //letters b to f lowercase
if(65)
newcolor += "9"
if(66 to 70)
newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase
newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase
else
break
if(ReadHSV(newcolor)[3] >= ReadHSV("#7F7F7F")[3])
@@ -1557,7 +1557,7 @@
name = "Invisible Powder"
colorname = "invisible"
color = "#FFFFFF00" // white + no alpha
random_color_list = list(null) //because using the powder color turns things invisible
random_color_list = list(null) //because using the powder color turns things invisible
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/colorful_reagent/powder/black
@@ -2078,7 +2078,7 @@
. = ..()
if(!istype(exposed_turf))
return
exposed_turf.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit
exposed_turf.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit
/datum/reagent/drying_agent/expose_obj(obj/exposed_obj, reac_volume)
. = ..()
@@ -2335,8 +2335,8 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/M)
var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS.
if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS.
if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)
if(prob(30))
to_chat(M, "You should sit down and take a rest...")
@@ -2379,8 +2379,8 @@
if(HAS_TRAIT(L, TRAIT_NOHUNGER)) //they can't puke
holder.del_reagent(type)
#define YUCK_PUKE_CYCLES 3 // every X cycle is a puke
#define YUCK_PUKES_TO_STUN 3 // hit this amount of pukes in a row to start stunning
#define YUCK_PUKE_CYCLES 3 // every X cycle is a puke
#define YUCK_PUKES_TO_STUN 3 // hit this amount of pukes in a row to start stunning
/datum/reagent/yuck/on_mob_life(mob/living/carbon/C)
if(!yuck_cycle)
if(prob(8))
@@ -65,7 +65,7 @@
if(chems.has_reagent(type, 1))
mytray.adjustToxic(3) //It is still toxic, mind you, but not to the same degree.
#define LIQUID_PLASMA_BP (50+T0C)
#define LIQUID_PLASMA_BP (50+T0C)
/datum/reagent/toxin/plasma
name = "Plasma"
@@ -436,7 +436,7 @@
. = 1
..()
/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots
/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots
name = "Beer"
description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target."
color = "#664300" // rgb: 102, 67, 0
@@ -327,7 +327,7 @@
results = list(/datum/reagent/ammonia = 3)
required_reagents = list(/datum/reagent/hydrogen = 3, /datum/reagent/nitrogen = 1)
optimal_ph_min = 1 // Lets increase our range for this basic chem
optimal_ph_max = 12
optimal_ph_max = 12
H_ion_release = -0.02 //handmade is more neutral
/datum/chemical_reaction/diethylamine
@@ -346,7 +346,7 @@
/datum/chemical_reaction/weedkiller
results = list(/datum/reagent/toxin/plantbgone/weedkiller = 5)
required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/ammonia = 4)
H_ion_release = -0.05 // Push towards acidic
H_ion_release = -0.05 // Push towards acidic
/datum/chemical_reaction/pestkiller
results = list(/datum/reagent/toxin/pestkiller = 5)
@@ -487,7 +487,7 @@
..()
//scream powder
/datum/chemical_reaction/scream
required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/lizardwine = 5 )
required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/lizardwine = 5 )
required_temp = 374
reaction_flags = REACTION_INSTANT
@@ -470,7 +470,7 @@
var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN
/datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/equilibrium/reaction, datum/reagents/holder, created_volume)
var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
var/T2 = created_volume * 50
var/T3 = created_volume * 120
var/added_delay = 0.5 SECONDS
@@ -480,7 +480,7 @@
if(created_volume >= 40)
addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T2), added_delay)
added_delay += 1.5 SECONDS
if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T3), added_delay)
addtimer(CALLBACK(src, .proc/explode, holder, created_volume), added_delay)
@@ -516,7 +516,7 @@
required_reagents = list(/datum/reagent/stabilizing_agent = 1,/datum/reagent/fluorosurfactant = 1,/datum/reagent/carbon = 1)
required_temp = 200
is_cold_recipe = 1
optimal_temp = 50
optimal_temp = 50
overheat_temp = 5
thermic_constant= -1
H_ion_release = -0.02
@@ -34,7 +34,7 @@
purity_min = 0
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////// Example competitive reaction (REACTION_COMPETITIVE) //////////////////////////////////
//////////////////// Example competitive reaction (REACTION_COMPETITIVE) //////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1,4 +1,4 @@
#define C2NAMEREAGENT "[initial(reagent.name)] (Has Side-Effects)"
#define C2NAMEREAGENT "[initial(reagent.name)] (Has Side-Effects)"
/*
Contains:
Borg Hypospray
@@ -98,9 +98,9 @@ Borg Hypospray
if(R?.cell)
for(var/i in 1 to reagent_ids.len)
var/datum/reagents/RG = reagent_list[i]
if(RG.total_volume < RG.maximum_volume) //Don't recharge reagents and drain power if the storage is full.
R.cell.use(charge_cost) //Take power from borg...
RG.add_reagent(reagent_ids[i], 5) //And fill hypo with reagent.
if(RG.total_volume < RG.maximum_volume) //Don't recharge reagents and drain power if the storage is full.
R.cell.use(charge_cost) //Take power from borg...
RG.add_reagent(reagent_ids[i], 5) //And fill hypo with reagent.
/obj/item/reagent_containers/borghypo/attack(mob/living/carbon/M, mob/user)
var/datum/reagents/R = reagent_list[mode]
@@ -133,7 +133,7 @@ Borg Hypospray
/obj/item/reagent_containers/borghypo/examine(mob/user)
. = ..()
. += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this
. += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this
var/datum/reagent/loaded = modes[mode]
. += "Currently loaded: [initial(loaded.name)]. [initial(loaded.description)]"
. += "<span class='notice'><i>Alt+Click</i> to change transfer amount. Currently set to [amount_per_transfer_from_this == 5 ? "dose normally (5u)" : "microdose (2u)"].</span>"
@@ -8,7 +8,7 @@
volume = 40
apply_type = PATCH
apply_method = "apply"
self_delay = 30 // three seconds
self_delay = 30 // three seconds
dissolvable = FALSE
/obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user)
@@ -253,7 +253,7 @@
var/generate_amount = 5
var/generate_type = /datum/reagent/water
var/last_generate = 0
var/generate_delay = 10 //deciseconds
var/generate_delay = 10 //deciseconds
can_fill_from_container = FALSE
/obj/item/reagent_containers/spray/waterflower/cyborg/hacked
@@ -263,7 +263,7 @@
volume = 3
generate_type = /datum/reagent/clf3
generate_amount = 1
generate_delay = 40 //deciseconds
generate_delay = 40 //deciseconds
/obj/item/reagent_containers/spray/waterflower/cyborg/Initialize()
. = ..()
@@ -340,7 +340,7 @@
var/generate_amount = 50
var/generate_type = /datum/reagent/space_cleaner
var/last_generate = 0
var/generate_delay = 10 //deciseconds
var/generate_delay = 10 //deciseconds
/obj/item/reagent_containers/spray/chemsprayer/janitor/Initialize()
. = ..()
@@ -10,7 +10,7 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5, 10, 15)
volume = 15
var/busy = FALSE // needed for delayed drawing of blood
var/busy = FALSE // needed for delayed drawing of blood
var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun
custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
reagent_flags = TRANSPARENT