mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 04:32:42 +00:00
Polaris sync
This commit is contained in:
killer653
@@ -43,6 +43,7 @@
|
||||
|
||||
/datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
switch(alien)
|
||||
if(IS_DIONA) return
|
||||
if(IS_UNATHI) removed *= 0.5
|
||||
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
|
||||
M.heal_organ_damage(0.5 * removed, 0)
|
||||
@@ -1016,7 +1017,7 @@
|
||||
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
|
||||
glass_special = list(DRINK_FIZZ)
|
||||
|
||||
/datum/reagent/drink/nuka_cola/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
/datum/reagent/drink/soda/nuka_cola/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
M.add_chemical_effect(CE_SPEEDBOOST, 1)
|
||||
M.make_jittery(20)
|
||||
@@ -1065,7 +1066,7 @@
|
||||
/datum/reagent/drink/soda/dr_gibb
|
||||
name = "Dr. Gibb"
|
||||
id = "dr_gibb"
|
||||
description = "A delicious blend of 42 different flavours"
|
||||
description = "A delicious blend of 42 different flavors"
|
||||
taste_description = "cherry soda"
|
||||
color = "#102000"
|
||||
adj_drowsy = -6
|
||||
@@ -1098,6 +1099,19 @@
|
||||
glass_desc = "A tangy substance made of 0.5% natural citrus!"
|
||||
glass_special = list(DRINK_FIZZ)
|
||||
|
||||
|
||||
/datum/reagent/drink/soda/gingerale
|
||||
name = "Ginger Ale"
|
||||
id = "gingerale"
|
||||
description = "The original."
|
||||
taste_description = "somewhat tangy ginger ale"
|
||||
color = "#edcf8f"
|
||||
adj_temp = -8
|
||||
|
||||
glass_name = "ginger ale"
|
||||
glass_desc = "The original, refreshing not-actually-ale."
|
||||
glass_special = list(DRINK_FIZZ)
|
||||
|
||||
/datum/reagent/drink/shirley_temple
|
||||
name = "Shirley Temple"
|
||||
id = "shirley_temple"
|
||||
@@ -1205,6 +1219,17 @@
|
||||
return
|
||||
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
|
||||
|
||||
/datum/reagent/drink/sweetsundaeramen
|
||||
name = "Dessert Ramen"
|
||||
id = "dessertramen"
|
||||
description = "How many things can you add to a cup of ramen before it begins to question its existance?"
|
||||
taste_description = "unbearable sweetness"
|
||||
color = "#4444FF"
|
||||
nutrition = 5
|
||||
|
||||
glass_name = "Sweet Sundae Ramen"
|
||||
glass_desc = "How many things can you add to a cup of ramen before it begins to question its existance?"
|
||||
|
||||
/datum/reagent/drink/ice
|
||||
name = "Ice"
|
||||
id = "ice"
|
||||
@@ -1360,14 +1385,15 @@
|
||||
/datum/reagent/ethanol/coffee/kahlua
|
||||
name = "Kahlua"
|
||||
id = "kahlua"
|
||||
description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
|
||||
description = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!"
|
||||
taste_description = "spiked latte"
|
||||
taste_mult = 1.1
|
||||
color = "#4C3100"
|
||||
strength = 15
|
||||
|
||||
glass_name = "RR coffee liquor"
|
||||
glass_desc = "DAMN, THIS THING LOOKS ROBUST"
|
||||
glass_desc = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!"
|
||||
// glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them.
|
||||
|
||||
/datum/reagent/ethanol/melonliquor
|
||||
name = "Melon Liquor"
|
||||
@@ -1383,14 +1409,14 @@
|
||||
/datum/reagent/ethanol/rum
|
||||
name = "Rum"
|
||||
id = "rum"
|
||||
description = "Yohoho and all that."
|
||||
description = "Yo-ho-ho and all that."
|
||||
taste_description = "spiked butterscotch"
|
||||
taste_mult = 1.1
|
||||
color = "#ECB633"
|
||||
strength = 15
|
||||
|
||||
glass_name = "rum"
|
||||
glass_desc = "Now you want to Pray for a pirate suit, don't you?"
|
||||
glass_desc = "Makes you want to buy a ship and just go pillaging."
|
||||
|
||||
/datum/reagent/ethanol/sake
|
||||
name = "Sake"
|
||||
@@ -1406,7 +1432,7 @@
|
||||
/datum/reagent/ethanol/tequila
|
||||
name = "Tequila"
|
||||
id = "tequilla"
|
||||
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
|
||||
description = "A strong and mildly flavored, Mexican produced spirit. Feeling thirsty hombre?"
|
||||
taste_description = "paint thinner"
|
||||
color = "#FFFF91"
|
||||
strength = 25
|
||||
@@ -1486,6 +1512,7 @@
|
||||
|
||||
// Cocktails
|
||||
|
||||
|
||||
/datum/reagent/ethanol/acid_spit
|
||||
name = "Acid Spit"
|
||||
id = "acidspit"
|
||||
@@ -1530,7 +1557,7 @@
|
||||
strength = 25
|
||||
|
||||
glass_name = "Amasec"
|
||||
glass_desc = "Always handy before COMBAT!!!"
|
||||
glass_desc = "Always handy before combat!"
|
||||
|
||||
/datum/reagent/ethanol/andalusia
|
||||
name = "Andalusia"
|
||||
@@ -1572,14 +1599,14 @@
|
||||
/datum/reagent/ethanol/coffee/b52
|
||||
name = "B-52"
|
||||
id = "b52"
|
||||
description = "Coffee, Irish Cream, and cognac. You will get bombed."
|
||||
description = "Kahlua, Irish cream, and cognac. You will get bombed."
|
||||
taste_description = "coffee, almonds, and whiskey"
|
||||
taste_mult = 1.3
|
||||
color = "#997650"
|
||||
strength = 12
|
||||
|
||||
glass_name = "B-52"
|
||||
glass_desc = "Kahlua, Irish cream, and congac. You will get bombed."
|
||||
glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed."
|
||||
|
||||
/datum/reagent/ethanol/bahama_mama
|
||||
name = "Bahama mama"
|
||||
@@ -1590,7 +1617,7 @@
|
||||
strength = 25
|
||||
|
||||
glass_name = "Bahama Mama"
|
||||
glass_desc = "Tropical cocktail"
|
||||
glass_desc = "Tropical cocktail."
|
||||
|
||||
/datum/reagent/ethanol/bananahonk
|
||||
name = "Banana Mama"
|
||||
@@ -1607,13 +1634,13 @@
|
||||
/datum/reagent/ethanol/barefoot
|
||||
name = "Barefoot"
|
||||
id = "barefoot"
|
||||
description = "Barefoot and pregnant"
|
||||
description = "Barefoot and pregnant."
|
||||
taste_description = "creamy berries"
|
||||
color = "#FFCDEA"
|
||||
strength = 30
|
||||
|
||||
glass_name = "Barefoot"
|
||||
glass_desc = "Barefoot and pregnant"
|
||||
glass_desc = "Barefoot and pregnant."
|
||||
|
||||
/datum/reagent/ethanol/beepsky_smash
|
||||
name = "Beepsky Smash"
|
||||
@@ -1725,14 +1752,14 @@
|
||||
/datum/reagent/ethanol/demonsblood
|
||||
name = "Demons Blood"
|
||||
id = "demonsblood"
|
||||
description = "AHHHH!!!!"
|
||||
description = "This thing makes the hair on the back of your neck stand up."
|
||||
taste_description = "sweet tasting iron"
|
||||
taste_mult = 1.5
|
||||
color = "#820000"
|
||||
strength = 15
|
||||
|
||||
glass_name = "Demons' Blood"
|
||||
glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
|
||||
glass_desc = "Just looking at this thing makes the hair on the back of your neck stand up."
|
||||
|
||||
/datum/reagent/ethanol/devilskiss
|
||||
name = "Devils Kiss"
|
||||
@@ -2050,7 +2077,7 @@
|
||||
/datum/reagent/ethanol/sbiten
|
||||
name = "Sbiten"
|
||||
id = "sbiten"
|
||||
description = "A spicy Vodka! Might be a little hot for the little guys!"
|
||||
description = "A spicy Vodka! Might be a bit hot for the little guys!"
|
||||
taste_description = "hot and spice"
|
||||
color = "#FFA371"
|
||||
strength = 15
|
||||
@@ -2121,7 +2148,7 @@
|
||||
name = "Syndicate Bomb"
|
||||
id = "syndicatebomb"
|
||||
description = "Tastes like terrorism!"
|
||||
taste_description = "purified antagonism"
|
||||
taste_description = "strong alcohol"
|
||||
color = "#2E6671"
|
||||
strength = 10
|
||||
|
||||
@@ -2131,13 +2158,13 @@
|
||||
/datum/reagent/ethanol/tequilla_sunrise
|
||||
name = "Tequila Sunrise"
|
||||
id = "tequillasunrise"
|
||||
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
|
||||
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~."
|
||||
taste_description = "oranges"
|
||||
color = "#FFE48C"
|
||||
strength = 25
|
||||
|
||||
glass_name = "Tequilla Sunrise"
|
||||
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
|
||||
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..."
|
||||
|
||||
/datum/reagent/ethanol/threemileisland
|
||||
name = "Three Mile Island Iced Tea"
|
||||
@@ -2154,7 +2181,7 @@
|
||||
/datum/reagent/ethanol/toxins_special
|
||||
name = "Toxins Special"
|
||||
id = "phoronspecial"
|
||||
description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
|
||||
description = "This thing is literally on fire!"
|
||||
taste_description = "spicy toxins"
|
||||
reagent_state = LIQUID
|
||||
color = "#7F00FF"
|
||||
@@ -2163,7 +2190,7 @@
|
||||
targ_temp = 330
|
||||
|
||||
glass_name = "Toxins Special"
|
||||
glass_desc = "Whoah, this thing is on FIRE"
|
||||
glass_desc = "Whoah, this thing is on fire!"
|
||||
|
||||
/datum/reagent/ethanol/vodkamartini
|
||||
name = "Vodka Martini"
|
||||
@@ -2174,7 +2201,7 @@
|
||||
strength = 12
|
||||
|
||||
glass_name = "vodka martini"
|
||||
glass_desc ="A bastardisation of the classic martini. Still great."
|
||||
glass_desc ="A bastardization of the classic martini. Still great."
|
||||
|
||||
|
||||
/datum/reagent/ethanol/vodkatonic
|
||||
@@ -2216,7 +2243,7 @@
|
||||
/datum/reagent/ethanol/whiskeysoda
|
||||
name = "Whiskey Soda"
|
||||
id = "whiskeysoda"
|
||||
description = "For the more refined griffon."
|
||||
description = "Ultimate refreshment."
|
||||
taste_description = "carbonated whiskey"
|
||||
color = "#EAB300"
|
||||
strength = 15
|
||||
@@ -2238,13 +2265,181 @@
|
||||
/datum/reagent/ethanol/unathiliquor
|
||||
name = "Redeemer's Brew"
|
||||
id = "unathiliquor"
|
||||
description = "This barely qualifies as a drink, and could give jetfuel a run for its money. Also known to cause feelings of euphoria and numbness."
|
||||
description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness."
|
||||
taste_description = "spiced numbness"
|
||||
color = "#242424"
|
||||
strength = 5
|
||||
|
||||
glass_name = "unathi liquor"
|
||||
glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbimber beware!"
|
||||
glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbiber beware!"
|
||||
|
||||
/datum/reagent/ethanol/sakebomb
|
||||
name = "Sake Bomb"
|
||||
id = "sakebomb"
|
||||
description = "Alcohol in more alcohol."
|
||||
taste_description = "thick, dry alcohol"
|
||||
color = "#FFFF7F"
|
||||
strength = 15
|
||||
nutriment_factor = 1
|
||||
|
||||
glass_name = "Sake Bomb"
|
||||
glass_desc = "Some sake mixed into a pint of beer."
|
||||
|
||||
/datum/reagent/ethanol/tamagozake
|
||||
name = "Tamagozake"
|
||||
id = "tamagozake"
|
||||
description = "Sake, egg, and sugar. A disgusting folk cure."
|
||||
taste_description = "eggy booze"
|
||||
color = "#E8C477"
|
||||
strength = 30
|
||||
nutriment_factor = 3
|
||||
|
||||
glass_name = "Tamagozake"
|
||||
glass_desc = "An egg cracked into sake and sugar."
|
||||
|
||||
/datum/reagent/ethanol/ginzamary
|
||||
name = "Ginza Mary"
|
||||
id = "ginzamary"
|
||||
description = "An alcoholic drink made with vodka, sake, and juices."
|
||||
taste_description = "spicy tomato sake"
|
||||
color = "#FF3232"
|
||||
strength = 25
|
||||
|
||||
glass_name = "Ginza Mary"
|
||||
glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary."
|
||||
|
||||
/datum/reagent/ethanol/tokyorose
|
||||
name = "Tokyo Rose"
|
||||
id = "tokyorose"
|
||||
description = "A pale pink cocktail made with sake and berry juice."
|
||||
taste_description = "fruity booze"
|
||||
color = "#FA8072"
|
||||
strength = 35
|
||||
|
||||
glass_name = "Tokyo Rose"
|
||||
glass_desc = "It's kinda pretty!"
|
||||
|
||||
/datum/reagent/ethanol/saketini
|
||||
name = "Saketini"
|
||||
id = "sakitini"
|
||||
description = "For when you're too weeb for a real martini."
|
||||
taste_description = "dry alcohol"
|
||||
color = "#0064C8"
|
||||
strength = 15
|
||||
|
||||
glass_name = "Saketini"
|
||||
glass_desc = "What are you doing drinking this outside of New Kyoto?"
|
||||
|
||||
/datum/reagent/ethanol/coffee/elysiumfacepunch
|
||||
name = "Elysium Facepunch"
|
||||
id = "elysiumfacepunch"
|
||||
description = "A lothesome cocktail favored by Heaven's skeleton shift workers."
|
||||
taste_description = "sour coffee"
|
||||
color = "#8f7729"
|
||||
strength = 20
|
||||
|
||||
glass_name = "Elysium Facepunch"
|
||||
glass_desc = "A lothesome cocktail favored by Heaven's skeleton shift workers."
|
||||
|
||||
/datum/reagent/ethanol/erebusmoonrise
|
||||
name = "Erebus Moonrise"
|
||||
id = "erebusmoonrise"
|
||||
description = "A deeply alcoholic mix, popular in Nyx."
|
||||
taste_description = "hard alcohol"
|
||||
color = "#947459"
|
||||
strength = 10
|
||||
|
||||
glass_name = "Erebus Moonrise"
|
||||
glass_desc = "A deeply alcoholic mix, popular in Nyx."
|
||||
|
||||
/datum/reagent/ethanol/balloon
|
||||
name = "Balloon"
|
||||
id = "balloon"
|
||||
description = "A strange drink invented in the aerostats of Venus."
|
||||
taste_description = "strange alcohol"
|
||||
color = "#FAEBD7"
|
||||
strength = 66
|
||||
|
||||
glass_name = "Balloon"
|
||||
glass_desc = "A strange drink invented in the aerostats of Venus."
|
||||
|
||||
/datum/reagent/ethanol/natunabrandy
|
||||
name = "Natuna Brandy"
|
||||
id = "natunabrandy"
|
||||
description = "On Natuna, they do the best with what they have."
|
||||
taste_description = "watered-down beer"
|
||||
color = "#FFFFCC"
|
||||
strength = 80
|
||||
|
||||
glass_name = "Natuna Brandy"
|
||||
glass_desc = "On Natuna, they do the best with what they have."
|
||||
glass_special = list(DRINK_FIZZ)
|
||||
|
||||
/datum/reagent/ethanol/euphoria
|
||||
name = "Euphoria"
|
||||
id = "euphoria"
|
||||
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
|
||||
taste_description = "impossibly rich alcohol"
|
||||
color = "#614126"
|
||||
strength = 9
|
||||
|
||||
glass_name = "Euphoria"
|
||||
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
|
||||
|
||||
/datum/reagent/ethanol/xanaducannon
|
||||
name = "Xanadu Cannon"
|
||||
id = "xanaducannon"
|
||||
description = "Common in the entertainment districts of Titan."
|
||||
taste_description = "sweet alcohol"
|
||||
color = "#614126"
|
||||
strength = 50
|
||||
|
||||
glass_name = "Xanadu Cannon"
|
||||
glass_desc = "Common in the entertainment districts of Titan."
|
||||
|
||||
/datum/reagent/ethanol/debugger
|
||||
name = "Debugger"
|
||||
id = "debugger"
|
||||
description = "From Shelf. Not for human consumption."
|
||||
taste_description = "oily bitterness"
|
||||
color = "#d3d3d3"
|
||||
strength = 36
|
||||
|
||||
glass_name = "Debugger"
|
||||
glass_desc = "From Shelf. Not for human consumption."
|
||||
|
||||
/datum/reagent/ethanol/spacersbrew
|
||||
name = "Spacer's Brew"
|
||||
id = "spacersbrew"
|
||||
description = "Ethanol and orange soda. A common emergency drink on frontier colonies."
|
||||
taste_description = "bitter oranges"
|
||||
color = "#ffc04c"
|
||||
strength = 43
|
||||
|
||||
glass_name = "Spacer's Brew"
|
||||
glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies."
|
||||
|
||||
/datum/reagent/ethanol/binmanbliss
|
||||
name = "Binman Bliss"
|
||||
id = "binmanbliss"
|
||||
description = "A dry cocktail popular on Binma."
|
||||
taste_description = "very dry alcohol"
|
||||
color = "#c3c3c3"
|
||||
strength = 24
|
||||
|
||||
glass_name = "Binman Bliss"
|
||||
glass_desc = "A dry cocktail popular on Binma."
|
||||
|
||||
/datum/reagent/ethanol/chrysanthemum
|
||||
name = "Chrysanthemum"
|
||||
id = "chrysanthemum"
|
||||
description = "An exotic cocktail from New Kyoto."
|
||||
taste_description = "fruity liquor"
|
||||
color = "#9999FF"
|
||||
strength = 35
|
||||
|
||||
glass_name = "Chrysanthemum"
|
||||
glass_desc = "An exotic cocktail from New Kyoto."
|
||||
|
||||
/datum/reagent/ethanol/unathiliquor/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
@@ -2257,4 +2452,5 @@
|
||||
|
||||
M.druggy = max(M.druggy, drug_strength)
|
||||
if(prob(10) && isturf(M.loc) && !istype(M.loc, /turf/space) && M.canmove && !M.restrained())
|
||||
step(M, pick(cardinal))
|
||||
step(M, pick(cardinal))
|
||||
|
||||
|
||||
@@ -252,12 +252,13 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#800080"
|
||||
overdose = 20
|
||||
scannable = 1
|
||||
metabolism = 0.02
|
||||
mrate_static = TRUE
|
||||
|
||||
/datum/reagent/oxycodone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
M.add_chemical_effect(CE_PAINKILLER, 200)
|
||||
M.eye_blurry += 10
|
||||
M.eye_blurry = min(M.eye_blurry + 10, 250)
|
||||
M.Confuse(5)
|
||||
|
||||
/datum/reagent/oxycodone/overdose(var/mob/living/carbon/M, var/alien)
|
||||
@@ -290,6 +291,23 @@
|
||||
M.adjustToxLoss(5 * removed) // It used to be incredibly deadly due to an oversight. Not anymore!
|
||||
M.add_chemical_effect(CE_PAINKILLER, 20)
|
||||
|
||||
/datum/reagent/hyperzine
|
||||
name = "Hyperzine"
|
||||
id = "hyperzine"
|
||||
description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
|
||||
taste_description = "bitterness"
|
||||
reagent_state = LIQUID
|
||||
color = "#FF3300"
|
||||
overdose = REAGENTS_OVERDOSE * 0.5
|
||||
|
||||
/datum/reagent/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_TAJARA)
|
||||
removed *= 1.25
|
||||
..()
|
||||
if(prob(5))
|
||||
M.emote(pick("twitch", "blink_r", "shiver"))
|
||||
M.add_chemical_effect(CE_SPEEDBOOST, 1)
|
||||
|
||||
/datum/reagent/alkysine
|
||||
name = "Alkysine"
|
||||
id = "alkysine"
|
||||
@@ -351,7 +369,7 @@
|
||||
I.damage = max(I.damage - removed, 0)
|
||||
H.Confuse(5)
|
||||
if(I.damage <= 5 && I.organ_tag == O_EYES)
|
||||
H.eye_blurry += 10 //Eyes need to reset, or something
|
||||
H.eye_blurry = min(M.eye_blurry + 10, 250) //Eyes need to reset, or something
|
||||
H.sdisabilities &= ~BLIND
|
||||
|
||||
/datum/reagent/osteodaxon
|
||||
@@ -390,7 +408,7 @@
|
||||
/datum/reagent/myelamine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_DIONA)
|
||||
return
|
||||
M.eye_blurry += (repair_strength * removed)
|
||||
M.eye_blurry += min(M.eye_blurry + (repair_strength * removed), 250)
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/wound_heal = removed * repair_strength
|
||||
|
||||
@@ -43,6 +43,33 @@
|
||||
color = "#003333"
|
||||
strength = 10
|
||||
|
||||
//R-UST port
|
||||
// Produced during deuterium synthesis. Super poisonous, SUPER flammable (doesn't need oxygen to burn).
|
||||
/datum/reagent/toxin/hydrophoron
|
||||
name = "Hydrophoron"
|
||||
id = "hydrophoron"
|
||||
description = "An exceptionally flammable molecule formed from deuterium synthesis."
|
||||
strength = 80
|
||||
var/fire_mult = 30
|
||||
|
||||
/datum/reagent/toxin/hydrophoron/touch_mob(var/mob/living/L, var/amount)
|
||||
if(istype(L))
|
||||
L.adjust_fire_stacks(amount / fire_mult)
|
||||
|
||||
/datum/reagent/toxin/hydrophoron/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
M.take_organ_damage(0, removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns
|
||||
if(prob(10 * fire_mult))
|
||||
M.pl_effects()
|
||||
|
||||
/datum/reagent/toxin/hydrophoron/touch_turf(var/turf/simulated/T)
|
||||
if(!istype(T))
|
||||
return
|
||||
T.assume_gas("phoron", ceil(volume/2), T20C)
|
||||
for(var/turf/simulated/floor/target_tile in range(0,T))
|
||||
target_tile.assume_gas("volatile_fuel", volume/2, 400+T0C)
|
||||
spawn (0) target_tile.hotspot_expose(700, 400)
|
||||
remove_self(volume)
|
||||
|
||||
/datum/reagent/toxin/spidertoxin
|
||||
name = "Spidertoxin"
|
||||
id = "spidertoxin"
|
||||
@@ -101,24 +128,6 @@
|
||||
M.adjustOxyLoss(20 * removed)
|
||||
M.sleeping += 1
|
||||
|
||||
/datum/reagent/toxin/hyperzine
|
||||
name = "Hyperzine"
|
||||
id = "hyperzine"
|
||||
description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
|
||||
taste_description = "bitterness"
|
||||
reagent_state = LIQUID
|
||||
color = "#FF3300"
|
||||
overdose = REAGENTS_OVERDOSE * 0.5
|
||||
strength = 2
|
||||
|
||||
/datum/reagent/toxin/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_TAJARA)
|
||||
removed *= 1.25
|
||||
..()
|
||||
if(prob(5))
|
||||
M.emote(pick("twitch", "blink_r", "shiver"))
|
||||
M.add_chemical_effect(CE_SPEEDBOOST, 1)
|
||||
|
||||
/datum/reagent/toxin/stimm //Homemade Hyperzine
|
||||
name = "Stimm"
|
||||
id = "stimm"
|
||||
@@ -315,8 +324,12 @@
|
||||
if(istype(H) && (H.species.flags & NO_SCAN))
|
||||
return
|
||||
|
||||
//The original coder comment here wanted it to be "Approx. one mutation per 10 injected/20 ingested/30 touching units"
|
||||
//The issue was, it was removed (.2) multiplied by .1, which resulted in a .02% chance per tick to have a mutation occur. Or more accurately, 5000 injected for a single mutation.
|
||||
//To honor their original idea, let's keep it as 10/20/30 as they wanted... For the most part.
|
||||
|
||||
if(M.dna)
|
||||
if(prob(removed * 0.1)) // Approx. one mutation per 10 injected/20 ingested/30 touching units
|
||||
if(prob(removed * 10)) // Removed is .2 per tick. Multiplying it by 10 makes it a 2% chance per tick. 10 units has 50 ticks, so 10 units injected should give a single good/bad mutation.
|
||||
randmuti(M)
|
||||
if(prob(98))
|
||||
randmutb(M)
|
||||
@@ -324,6 +337,9 @@
|
||||
randmutg(M)
|
||||
domutcheck(M, null)
|
||||
M.UpdateAppearance()
|
||||
if(prob(removed * 40)) //Additionally, let's make it so there's an 8% chance per tick for a random cosmetic/not guranteed good/bad mutation.
|
||||
randmuti(M)//This should equate to 4 random cosmetic mutations per 10 injected/20 ingested/30 touching units
|
||||
M << "<span class='warning'>You feel odd!</span>"
|
||||
M.apply_effect(10 * removed, IRRADIATE, 0)
|
||||
|
||||
/datum/reagent/slimejelly
|
||||
@@ -600,7 +616,7 @@
|
||||
return
|
||||
|
||||
if(M.dna)
|
||||
if(prob(removed * 0.1))
|
||||
if(prob(removed * 10))
|
||||
randmuti(M)
|
||||
if(prob(98))
|
||||
randmutb(M)
|
||||
@@ -608,6 +624,9 @@
|
||||
randmutg(M)
|
||||
domutcheck(M, null)
|
||||
M.UpdateAppearance()
|
||||
if(prob(removed * 40))
|
||||
randmuti(M)
|
||||
M << "<span class='warning'>You feel odd!</span>"
|
||||
M.apply_effect(16 * removed, IRRADIATE, 0)
|
||||
|
||||
/datum/reagent/aslimetoxin
|
||||
@@ -627,7 +646,7 @@
|
||||
return
|
||||
|
||||
if(M.dna)
|
||||
if(prob(removed * 0.1))
|
||||
if(prob(removed * 10))
|
||||
randmuti(M)
|
||||
if(prob(98))
|
||||
randmutb(M)
|
||||
@@ -635,4 +654,7 @@
|
||||
randmutg(M)
|
||||
domutcheck(M, null)
|
||||
M.UpdateAppearance()
|
||||
if(prob(removed * 40))
|
||||
randmuti(M)
|
||||
M << "<span class='warning'>You feel odd!</span>"
|
||||
M.apply_effect(6 * removed, IRRADIATE, 0)
|
||||
|
||||
@@ -1230,7 +1230,7 @@
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/nuka_cola
|
||||
name = "Nuka Cola"
|
||||
name = "Nuclear Cola"
|
||||
id = "nuka_cola"
|
||||
result = "nuka_cola"
|
||||
required_reagents = list("uranium" = 1, "cola" = 5)
|
||||
@@ -1783,15 +1783,15 @@
|
||||
name = "Shirley Temple"
|
||||
id = "shirley_temple"
|
||||
result = "shirley_temple"
|
||||
required_reagents = list("lemon_lime" = 4, "grenadine" = 1)
|
||||
required_reagents = list("gingerale" = 4, "grenadine" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drinks/royrogers
|
||||
name = "Roy Rogers"
|
||||
id = "roy_rogers"
|
||||
result = "roy_rogers"
|
||||
required_reagents = list("cola" = 4, "grenadine" = 1)
|
||||
result_amount = 5
|
||||
required_reagents = list("gingerale" = 4, "lemon_lime" = 2, "grenadine" = 1)
|
||||
result_amount = 7
|
||||
|
||||
/datum/chemical_reaction/drinks/collinsmix
|
||||
name = "Collins Mix"
|
||||
@@ -1841,3 +1841,130 @@
|
||||
result = "berrytea"
|
||||
required_reagents = list("tea" = 5, "berryjuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/drinks/sakebomb
|
||||
name = "Sake Bomb"
|
||||
id = "sakebomb"
|
||||
result = "sakebomb"
|
||||
required_reagents = list("beer" = 2, "sake" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/tamagozake
|
||||
name = "Tamagozake"
|
||||
id = "tamagozake"
|
||||
result = "tamagozake"
|
||||
required_reagents = list("sake" = 10, "sugar" = 5, "egg" = 3)
|
||||
result_amount = 15
|
||||
|
||||
/datum/chemical_reaction/drinks/ginzamary
|
||||
name = "Ginza Mary"
|
||||
id = "ginzamary"
|
||||
result = "ginzamary"
|
||||
required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drinks/tokyorose
|
||||
name = "Tokyo Rose"
|
||||
id = "tokyorose"
|
||||
result = "tokyorose"
|
||||
required_reagents = list("sake" = 1, "berryjuice" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/saketini
|
||||
name = "Saketini"
|
||||
id = "saketini"
|
||||
result = "saketini"
|
||||
required_reagents = list("sake" = 1, "gin" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/elysiumfacepunch
|
||||
name = "Elysium Facepunch"
|
||||
id = "elysiumfacepunch"
|
||||
result = "elysiumfacepunch"
|
||||
required_reagents = list("kahlua" = 1, "lemonjuice" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/erebusmoonrise
|
||||
name = "Erebus Moonrise"
|
||||
id = "erebusmoonrise"
|
||||
result = "erebusmoonrise"
|
||||
required_reagents = list("whiskey" = 1, "vodka" = 1, "tequilla" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/balloon
|
||||
name = "Balloon"
|
||||
id = "balloon"
|
||||
result = "balloon"
|
||||
required_reagents = list("cream" = 1, "bluecuracao" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/natunabrandy
|
||||
name = "Natuna Brandy"
|
||||
id = "natunabrandy"
|
||||
result = "natunabrandy"
|
||||
required_reagents = list("beer" = 1, "sodawater" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/euphoria
|
||||
name = "Euphoria"
|
||||
id = "euphoria"
|
||||
result = "euphoria"
|
||||
required_reagents = list("specialwhiskey" = 1, "cognac" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/xanaducannon
|
||||
name = "Xanadu Cannon"
|
||||
id = "xanaducannon"
|
||||
result = "xanaducannon"
|
||||
required_reagents = list("ale" = 1, "dr_gibb" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/debugger
|
||||
name = "Debugger"
|
||||
id = "debugger"
|
||||
result = "debugger"
|
||||
required_reagents = list("fuel" = 1, "sugar" = 2, "cornoil" = 2)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drinks/spacersbrew
|
||||
name = "Spacer's Brew"
|
||||
id = "spacersbrew"
|
||||
result = "spacersbrew"
|
||||
required_reagents = list("brownstar" = 4, "ethanol" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drinks/binmanbliss
|
||||
name = "Binman Bliss"
|
||||
id = "binmanbliss"
|
||||
result = "binmanbliss"
|
||||
required_reagents = list("sake" = 1, "tequilla" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/drinks/chrysanthemum
|
||||
name = "Chrysanthemum"
|
||||
id = "chrysanthemum"
|
||||
result = "chrysanthemum"
|
||||
required_reagents = list("sake" = 1, "melonliquor" = 1)
|
||||
result_amount = 2
|
||||
|
||||
//R-UST Port
|
||||
/datum/chemical_reaction/hyrdophoron
|
||||
name = "Hydrophoron"
|
||||
id = "hydrophoron"
|
||||
result = "hydrophoron"
|
||||
required_reagents = list("hydrogen" = 1, "phoron" = 1)
|
||||
inhibitors = list("nitrogen" = 1) //So it doesn't mess with lexorin
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/deuterium
|
||||
name = "Deuterium"
|
||||
id = "deuterium"
|
||||
result = null
|
||||
required_reagents = list("water" = 10)
|
||||
catalysts = list("hydrophoron" = 5)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/deuterium/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
var/turf/T = get_turf(holder.my_atom)
|
||||
if(istype(T)) new /obj/item/stack/material/deuterium(T, created_volume)
|
||||
return
|
||||
@@ -65,9 +65,9 @@
|
||||
|
||||
/obj/machinery/chemical_dispenser/attackby(obj/item/weapon/W, mob/user)
|
||||
if(istype(W, /obj/item/weapon/wrench))
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
|
||||
playsound(src, W.usesound, 50, 1)
|
||||
user << "<span class='notice'>You begin to [anchored ? "un" : ""]fasten \the [src].</span>"
|
||||
if (do_after(user, 20))
|
||||
if (do_after(user, 20 * W.toolspeed))
|
||||
user.visible_message(
|
||||
"<span class='notice'>\The [user] [anchored ? "un" : ""]fastens \the [src].</span>",
|
||||
"<span class='notice'>You have [anchored ? "un" : ""]fastened \the [src].</span>",
|
||||
@@ -86,6 +86,7 @@
|
||||
if(C)
|
||||
user << "<span class='notice'>You remove \the [C] from \the [src].</span>"
|
||||
C.loc = loc
|
||||
playsound(src, W.usesound, 50, 1)
|
||||
|
||||
else if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food))
|
||||
if(container)
|
||||
|
||||
@@ -13,15 +13,15 @@
|
||||
var/charge_tick = 0
|
||||
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
|
||||
|
||||
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
|
||||
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
|
||||
var/list/reagent_volumes = list()
|
||||
var/list/reagent_names = list()
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/surgeon
|
||||
reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
|
||||
reagent_ids = list("tricordrazine", "inaprovaline", "oxycodone", "dexalin" ,"spaceacillin")
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/crisis
|
||||
reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
|
||||
reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/New()
|
||||
..()
|
||||
@@ -121,7 +121,7 @@
|
||||
recharge_time = 3
|
||||
volume = 60
|
||||
possible_transfer_amounts = list(5, 10, 20, 30)
|
||||
reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
|
||||
reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
|
||||
return
|
||||
|
||||
@@ -124,3 +124,13 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater/New()
|
||||
..()
|
||||
reagents.add_reagent("sodawater", 50)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale
|
||||
name = "\improper Classic Ginger Ale"
|
||||
desc = "For when you need to be more retro than NanoTrasen already pays you for."
|
||||
icon_state = "gingerale"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale/New()
|
||||
..()
|
||||
reagents.add_reagent("gingerale", 30)
|
||||
@@ -518,3 +518,13 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/New()
|
||||
..()
|
||||
reagents.add_reagent("ale", 30)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
|
||||
name = "Mono-No-Aware Luxury Sake"
|
||||
desc = "Dry alcohol made from rice, a favorite of businessmen."
|
||||
icon_state = "sakebottle"
|
||||
center_of_mass = list("x"=16, "y"=3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/New()
|
||||
..()
|
||||
reagents.add_reagent("sake", 100)
|
||||
|
||||
@@ -58,7 +58,7 @@ var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing,
|
||||
/datum/reagent/drink/dry_ramen,
|
||||
/datum/reagent/drink/hell_ramen,
|
||||
/datum/reagent/drink/hot_ramen,
|
||||
/datum/reagent/drink/nuka_cola)
|
||||
/datum/reagent/drink/soda/nuka_cola)
|
||||
|
||||
// This default list is a bit different, it contains items we don't want
|
||||
var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
sandwich_limit += 4
|
||||
|
||||
if(istype(W,/obj/item/weapon/material/shard))
|
||||
user << "\blue You hide [W] in \the [src]."
|
||||
user << "<font color='blue'>You hide [W] in \the [src].</font>"
|
||||
user.drop_item()
|
||||
W.loc = src
|
||||
update()
|
||||
return
|
||||
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
|
||||
if(src.contents.len > sandwich_limit)
|
||||
user << "\red If you put anything else on \the [src] it's going to collapse."
|
||||
user << "<font color='red'>If you put anything else on \the [src] it's going to collapse.</font>"
|
||||
return
|
||||
user << "\blue You layer [W] over \the [src]."
|
||||
user << "<font color='blue'>You layer [W] over \the [src].</font>"
|
||||
var/obj/item/weapon/reagent_containers/F = W
|
||||
F.reagents.trans_to_obj(src, F.reagents.total_volume)
|
||||
user.drop_item()
|
||||
@@ -81,7 +81,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
|
||||
..(user)
|
||||
var/obj/item/O = pick(contents)
|
||||
user << "\blue You think you can see [O.name] in there."
|
||||
user << "<font color='blue'>You think you can see [O.name] in there.</font>"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
|
||||
@@ -96,6 +96,6 @@
|
||||
H = M
|
||||
|
||||
if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
|
||||
H << "\red You lacerate your mouth on a [shard.name] in the sandwich!"
|
||||
H.adjustBruteLoss(5) //TODO: Target head if human.
|
||||
H << "<font color='red'>You lacerate your mouth on a [shard.name] in the sandwich!</font>"
|
||||
H.adjustBruteLoss(5) //TODO: Target head if human. //This TODO has been here for 4 years.
|
||||
..()
|
||||
|
||||
@@ -145,11 +145,11 @@
|
||||
if (bitecount==0)
|
||||
return
|
||||
else if (bitecount==1)
|
||||
user << "\blue \The [src] was bitten by someone!"
|
||||
user << "<font color='blue'>\The [src] was bitten by someone!</font>"
|
||||
else if (bitecount<=3)
|
||||
user << "\blue \The [src] was bitten [bitecount] times!"
|
||||
user << "<font color='blue'>\The [src] was bitten [bitecount] times!</font>"
|
||||
else
|
||||
user << "\blue \The [src] was bitten multiple times!"
|
||||
user << "<font color='blue'>\The [src] was bitten multiple times!</font>"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W,/obj/item/weapon/storage))
|
||||
@@ -164,12 +164,12 @@
|
||||
U.create_reagents(5)
|
||||
|
||||
if (U.reagents.total_volume > 0)
|
||||
user << "\red You already have something on your [U]."
|
||||
user << "<font color='red'>You already have something on your [U].</font>"
|
||||
return
|
||||
|
||||
user.visible_message( \
|
||||
"[user] scoops up some [src] with \the [U]!", \
|
||||
"\blue You scoop up some [src] with \the [U]!" \
|
||||
"<font color='blue'>You scoop up some [src] with \the [U]!</font>" \
|
||||
)
|
||||
|
||||
src.bitecount++
|
||||
@@ -551,7 +551,7 @@
|
||||
..()
|
||||
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
|
||||
src.reagents.splash(hit_atom, reagents.total_volume)
|
||||
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
|
||||
src.visible_message("<font color='red'>[src.name] has been squashed.</font>","<font color='red'>You hear a smack.</font>")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
@@ -560,10 +560,10 @@
|
||||
var/clr = C.colourName
|
||||
|
||||
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
|
||||
usr << "\blue The egg refuses to take on this color!"
|
||||
usr << "<font color='blue'>The egg refuses to take on this color!</font>"
|
||||
return
|
||||
|
||||
usr << "\blue You color \the [src] [clr]"
|
||||
usr << "<font color='blue'>You color \the [src] [clr]</font>"
|
||||
icon_state = "egg-[clr]"
|
||||
else
|
||||
..()
|
||||
@@ -749,17 +749,17 @@
|
||||
reagents.add_reagent("pacid",6)
|
||||
src.bitesize = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/spidermeat
|
||||
name = "meat"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
|
||||
name = "spider meat"
|
||||
desc = "A slab of green meat."
|
||||
icon_state = "xenomeat"
|
||||
filling_color = "#43DE18"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New()
|
||||
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat/New()
|
||||
..()
|
||||
reagents.add_reagent("protein", 6)
|
||||
reagents.add_reagent("spidertoxin",6)
|
||||
reagents.remove_reagent("pacid",6)
|
||||
src.bitesize = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatball
|
||||
@@ -1277,7 +1277,7 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
|
||||
if(prob(unpopped)) //lol ...what's the point?
|
||||
usr << "\red You bite down on an un-popped kernel!"
|
||||
usr << "<font color='red'>You bite down on an un-popped kernel!</font>"
|
||||
unpopped = max(0, unpopped-1)
|
||||
..()
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
|
||||
if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
|
||||
for(var/mob/O in viewers(world.view, user))
|
||||
O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
|
||||
O.show_message(text("<font color='red'><B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B></font>"), 1)
|
||||
user.remove_from_mob(src)
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -111,6 +111,7 @@
|
||||
user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \
|
||||
"You wrench [src]'s faucet [modded ? "closed" : "open"]")
|
||||
modded = modded ? 0 : 1
|
||||
playsound(src, W.usesound, 75, 1)
|
||||
if (modded)
|
||||
message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>)")
|
||||
log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.")
|
||||
@@ -226,7 +227,7 @@
|
||||
if(istype(I, /obj/item/weapon/wrench))
|
||||
src.add_fingerprint(user)
|
||||
if(bottle)
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
|
||||
playsound(loc, I.usesound, 50, 1)
|
||||
if(do_after(user, 20) && bottle)
|
||||
user << "<span class='notice'>You unfasten the jug.</span>"
|
||||
var/obj/item/weapon/reagent_containers/glass/cooler_bottle/G = new /obj/item/weapon/reagent_containers/glass/cooler_bottle( src.loc )
|
||||
@@ -241,15 +242,16 @@
|
||||
user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
|
||||
else
|
||||
user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
|
||||
if(do_after(user, 20, src))
|
||||
if(do_after(user, 20 * I.toolspeed, src))
|
||||
if(!src) return
|
||||
user << "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>"
|
||||
anchored = !anchored
|
||||
playsound(loc, I.usesound, 50, 1)
|
||||
return
|
||||
|
||||
if(istype(I, /obj/item/weapon/screwdriver))
|
||||
if(cupholder)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
playsound(loc, I.usesound, 50, 1)
|
||||
user << "<span class='notice'>You take the cup dispenser off.</span>"
|
||||
new /obj/item/stack/material/plastic( src.loc )
|
||||
if(cups)
|
||||
@@ -260,9 +262,9 @@
|
||||
update_icon()
|
||||
return
|
||||
if(!bottle && !cupholder)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
playsound(loc, I.usesound, 50, 1)
|
||||
user << "<span class='notice'>You start taking the water-cooler apart.</span>"
|
||||
if(do_after(user, 20) && !bottle && !cupholder)
|
||||
if(do_after(user, 20 * I.toolspeed) && !bottle && !cupholder)
|
||||
user << "<span class='notice'>You take the water-cooler apart.</span>"
|
||||
new /obj/item/stack/material/plastic( src.loc, 4 )
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user