cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viro-fix-5

Browse Source
This commit is contained in:
Guti
2024-12-10 18:39:21 +01:00
parent 7dbfea8169 03a07fa806
commit be191f41f3
531 changed files with 9646 additions and 8149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/chem/foam.dm
+1 -1
View File
@@ -127,7 +127,7 @@
for(var/id in carried_reagents)
F.reagents.add_reagent(id, 1, safety = 1) //makes a safety call because all reagents should have already reacted anyway
else
F.reagents.add_reagent("water", 1, safety = 1)
F.reagents.add_reagent(REAGENT_ID_WATER, 1, safety = 1)
// wall formed by metal foams, dense and opaque, but easy to break
code/game/objects/effects/decals/crayon.dm
-1
View File
@@ -41,4 +41,3 @@
add_janitor_hud_overlay()
return
// CHOMPEdit End
code/game/objects/effects/mines.dm
+2 -2
View File
@@ -171,7 +171,7 @@
triggered = TRUE
for (var/turf/simulated/floor/target in range(1,src))
if(!target.blocks_air)
target.assume_gas("nitrous_oxide", 30)
target.assume_gas(GAS_N2O, 30)
visible_message("\The [src.name] detonates!")
spawn(0)
qdel(src)
@@ -185,7 +185,7 @@
triggered = TRUE
for (var/turf/simulated/floor/target in range(1,src))
if(!target.blocks_air)
target.assume_gas("phoron", 30)
target.assume_gas(GAS_PHORON, 30)
target.hotspot_expose(1000, CELL_VOLUME)
visible_message("\The [src.name] detonates!")
spawn(0)
code/game/objects/effects/spawners/bombspawner.dm
+3 -3
View File
@@ -63,14 +63,14 @@
OT.master = V
PT.valve_welded = 1
PT.air_contents.gas["phoron"] = phoron_amt
PT.air_contents.gas["carbon_dioxide"] = carbon_amt
PT.air_contents.gas[GAS_PHORON] = phoron_amt
PT.air_contents.gas[GAS_CO2] = carbon_amt
PT.air_contents.total_moles = phoron_amt + carbon_amt
PT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
PT.air_contents.update_values()
OT.valve_welded = 1
OT.air_contents.gas["oxygen"] = oxygen_amt
OT.air_contents.gas[GAS_O2] = oxygen_amt
OT.air_contents.total_moles = oxygen_amt
OT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
OT.air_contents.update_values()
code/game/objects/effects/temporary_visuals/miscellaneous.dm
+1 -1
View File
@@ -105,7 +105,7 @@
/obj/effect/temp_visual/heal
name = "healing glow"
icon_state = "heal"
icon_state = XENO_CHEM_HEAL
duration = 15
/obj/effect/temp_visual/heal/Initialize(mapload)
code/game/objects/items/contraband.dm
+5 -5
View File
@@ -17,14 +17,14 @@
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)
var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list(REAGENT_ID_CLEANER = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
list("mindbreaker" = 10, "bliss" = 20) = 3,
list("carpotoxin" = 15) = 2,
list("impedrezene" = 15) = 2,
list("zombiepowder" = 10) = 1)
list(REAGENT_ID_MINDBREAKER = 10, REAGENT_ID_BLISS = 20) = 3,
list(REAGENT_ID_CARPOTOXIN = 15) = 2,
list(REAGENT_ID_IMPEDREZENE = 15) = 2,
list(REAGENT_ID_ZOMBIEPOWDER = 10) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()
code/game/objects/items/crayons.dm
+2 -2
View File
@@ -115,7 +115,7 @@
if(M == user)
to_chat(user, "You take a bite of the crayon and swallow it.")
user.nutrition += 1
user.reagents.add_reagent("crayon_dust",min(5,uses)/3)
user.reagents.add_reagent(REAGENT_ID_CRAYONDUST,min(5,uses)/3)
if(uses)
uses -= 5
if(uses <= 0)
@@ -201,7 +201,7 @@
if(M == user)
to_chat(user, "You take a bite of the marker and swallow it.")
user.nutrition += 1
user.reagents.add_reagent("marker_ink",6)
user.reagents.add_reagent(REAGENT_ID_MARKERINK,6)
if(uses)
uses -= 5
if(uses <= 0)
code/game/objects/items/devices/advnifrepair.dm
+1 -1
View File
@@ -27,7 +27,7 @@
var/obj/item/stack/nanopaste/np = W
if((supply.get_free_space() >= efficiency) && np.use(1))
to_chat(user, span_notice("You convert some nanopaste into programmed nanites inside \the [src]."))
supply.add_reagent(id = "nifrepairnanites", amount = efficiency)
supply.add_reagent(id = REAGENT_ID_NIFREPAIRNANITES, amount = efficiency)
update_icon()
else if(supply.get_free_space() < efficiency)
to_chat(user, span_warning("\The [src] is too full. Empty it into a container first."))
code/game/objects/items/devices/communicator/helper.dm
+4 -4
View File
@@ -6,10 +6,10 @@
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
var/o2_level = environment.gas["oxygen"]/total_moles
var/n2_level = environment.gas["nitrogen"]/total_moles
var/co2_level = environment.gas["carbon_dioxide"]/total_moles
var/phoron_level = environment.gas["phoron"]/total_moles
var/o2_level = environment.gas[GAS_O2]/total_moles
var/n2_level = environment.gas[GAS_N2]/total_moles
var/co2_level = environment.gas[GAS_CO2]/total_moles
var/phoron_level = environment.gas[GAS_PHORON]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// Label is what the entry is describing
code/game/objects/items/devices/defib.dm
+1 -1
View File
@@ -339,7 +339,7 @@
if(!heart)
return TRUE
var/blood_volume = H.vessel.get_reagent_amount("blood")
var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(!heart || heart.is_broken())
blood_volume *= 0.3
else if(heart.is_bruised())
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -149,8 +149,8 @@
if(M.getBrainLoss() > 15)
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1)
var/list/pinpoint = list(REAGENT_ID_OXYCODONE=1,REAGENT_ID_TRAMADOL=5)
var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,REAGENT_ID_MINDBREAKER=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -66,7 +66,7 @@
. += "It has [uses] lights remaining."
/obj/item/lightreplacer/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/material) && W.get_material_name() == "glass" || istype(W, /obj/item/stack/material/cyborg/glass))
if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_GLASS || istype(W, /obj/item/stack/material/cyborg/glass))
var/obj/item/stack/G = W
if(uses >= max_uses)
to_chat(user, span_warning("[src.name] is full."))
code/game/objects/items/devices/scanners/guide.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(org.damage >= 1 && !istype(org, /obj/item/organ/internal/brain))
organ = TRUE
var/blood_volume = M.vessel.get_reagent_amount("blood")
var/blood_volume = M.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
if(blood_volume <= M.species.blood_volume*M.species.blood_level_safe)
bloodloss = TRUE
code/game/objects/items/devices/scanners/health.dm
+3 -3
View File
@@ -260,8 +260,8 @@
if (M.getCloneLoss())
dat += span_warning("Subject appears to have been imperfectly cloned.")
dat += "<br>"
// if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."))
// if (M.reagents && M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE))
// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount(REAGENT_ID_INAPROVALINE)] units of rejuvenation chemicals."))
if (M.has_brain_worms())
dat += span_warning("Subject suffering from aberrant brain activity. Recommend further scanning.")
dat += "<br>"
@@ -359,7 +359,7 @@
// Blood level
if(M:vessel)
var/blood_volume = H.vessel.get_reagent_amount("blood")
var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
var/blood_percent = round((blood_volume / H.species.blood_volume)*100)
var/blood_type = H.dna.b_type
var/blood_reagent = H.species.blood_reagents
code/game/objects/items/devices/scanners/mass_spectrometer.dm
+1 -1
View File
@@ -40,7 +40,7 @@
if(reagents.total_volume)
var/list/blood_traces = list()
for(var/datum/reagent/R in reagents.reagent_list)
if(R.id != "blood")
if(R.id != REAGENT_ID_BLOOD)
reagents.clear_reagents()
to_chat(user, span_warning("The sample was contaminated! Please insert another sample"))
return
code/game/objects/items/selectable_item_vr.dm
+3 -3
View File
@@ -43,6 +43,6 @@
desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals."
preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one."
preface_title = "Gender Chemistry Kit"
item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
"Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
"Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
item_options = list(REAGENT_ANDROROVIR = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
REAGENT_GYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
REAGENT_ANDROGYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
code/game/objects/items/stacks/sandbags.dm
+2 -2
View File
@@ -19,7 +19,7 @@
pass_color = TRUE
var/bag_material = "cloth"
var/bag_material = MAT_CLOTH
/obj/item/stack/sandbags/cyborg
name = "sandbag synthesizer"
@@ -130,7 +130,7 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \
pass_color = TRUE
var/bag_material = "cloth"
var/bag_material = MAT_CLOTH
/obj/item/stack/emptysandbag/Initialize(var/ml, var/amt, var/bag_mat)
. = ..(ml, amt)
code/game/objects/items/toys/toys.dm
+1 -1
View File
@@ -59,7 +59,7 @@
if(O.reagents.total_volume < 1)
to_chat(user, "The [O] is empty.")
else if(O.reagents.total_volume >= 1)
if(O.reagents.has_reagent("pacid", 1))
if(O.reagents.has_reagent(REAGENT_ID_PACID, 1))
to_chat(user, "The acid chews through the balloon!")
O.reagents.splash(user, reagents.total_volume)
qdel(src)
code/game/objects/items/weapons/chewables.dm
+7 -7
View File
@@ -104,12 +104,12 @@
/obj/item/clothing/mask/chewable/tobacco/cheap
name = "chewing tobacco"
desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 2)
filling = list(REAGENT_ID_NICOTINE = 2)
/obj/item/clothing/mask/chewable/tobacco/fine
name = "deluxe chewing tobacco"
desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 3)
filling = list(REAGENT_ID_NICOTINE = 3)
/obj/item/clothing/mask/chewable/tobacco/nico
name = "nicotine gum"
@@ -120,7 +120,7 @@
/obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
. = ..()
reagents.add_reagent("nicotine", 2)
reagents.add_reagent(REAGENT_ID_NICOTINE, 2)
color = reagents.get_color()
/obj/item/storage/chewables
@@ -215,7 +215,7 @@
slot_flags = SLOT_EARS | SLOT_MASK
chem_volume = 50
chewtime = 300
filling = list("sugar" = 2)
filling = list(REAGENT_ID_SUGAR = 2)
/obj/item/clothing/mask/chewable/candy/gum
name = "chewing gum"
@@ -226,7 +226,7 @@
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10)
color = reagents.get_color()
update_icon()
@@ -263,7 +263,7 @@
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20)
color = reagents.get_color()
update_icon()
@@ -287,7 +287,7 @@
desc = "A chocolate-coated biscuit stick."
icon_state = "pockystick"
item_state = "pocky"
filling = list("sugar" = 2, "chocolate" = 5)
filling = list(REAGENT_ID_SUGAR = 2, REAGENT_ID_CHOCOLATE = 5)
type_butt = null
/obj/item/clothing/mask/chewable/candy/pocky/process()
code/game/objects/items/weapons/cigs_lighters.dm
+5 -5
View File
@@ -169,15 +169,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
src.lit = 1
playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
damtype = "fire"
if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
if(reagents.get_reagent_amount(REAGENT_ID_PHORON)) // the phoron explodes when exposed to fire
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0)
e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_PHORON) / 2.5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_FUEL) / 5, 1), get_turf(src), 0, 0)
e.start()
qdel(src)
return
@@ -292,7 +292,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/cigarette/Initialize()
. = ..()
if(nicotine_amt)
reagents.add_reagent("nicotine", nicotine_amt)
reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt)
/obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob)
..()
code/game/objects/items/weapons/circuitboards/frame.dm
+1 -1
View File
@@ -85,7 +85,7 @@
name = T_BOARD("electrochromic button")
build_path = /obj/machinery/button/windowtint
board_type = new /datum/frame/frame_types/button
matter = list(MAT_STEEL = 50, "glass" = 50)
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
//Computer
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -23,7 +23,7 @@
wet()
/obj/item/soap/proc/wet()
reagents.add_reagent("cleaner", 5)
reagents.add_reagent(REAGENT_ID_CLEANER, 5)
/obj/item/soap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
code/game/objects/items/weapons/ecigs.dm
+26 -26
View File
@@ -170,85 +170,85 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
/obj/item/reagent_containers/ecig_cartridge/blanknico/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/med_nicotine
name = "tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 15)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 15)
/obj/item/reagent_containers/ecig_cartridge/high_nicotine
name = "high nicotine tobacco flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
..()
reagents.add_reagent("nicotine", 10)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/ecig_cartridge/orange
name = "orange flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
/obj/item/reagent_containers/ecig_cartridge/orange/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("orangejuice", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/mint
name = "mint flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
/obj/item/reagent_containers/ecig_cartridge/mint/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("menthol", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_MENTHOL, 5)
/obj/item/reagent_containers/ecig_cartridge/watermelon
name = "watermelon flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
/obj/item/reagent_containers/ecig_cartridge/watermelon/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("watermelonjuice", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/grape
name = "grape flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
/obj/item/reagent_containers/ecig_cartridge/grape/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("grapejuice", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5)
/obj/item/reagent_containers/ecig_cartridge/lemonlime
name = "lemon-lime flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
/obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("lemon_lime", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_LEMONLIME, 5)
/obj/item/reagent_containers/ecig_cartridge/coffee
name = "coffee flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
/obj/item/reagent_containers/ecig_cartridge/coffee/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent("coffee", 5)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent(REAGENT_ID_COFFEE, 5)
/*
/obj/item/reagent_containers/ecig_cartridge/cannabis
name = "herb flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
/obj/item/reagent_containers/ecig_cartridge/cannabis/New()
..()
reagents.add_reagent("nicotine", 5)
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
reagents.add_reagent("cannabis", 5)
*/
code/game/objects/items/weapons/extinguisher.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/item/extinguisher/Initialize()
create_reagents(max_water)
reagents.add_reagent("firefoam", max_water)
reagents.add_reagent(REAGENT_ID_FIREFOAM, max_water)
if(rand_overlays)
var/choice = rand(1,rand_overlays)
add_overlay("[item_state]O[choice]")
code/game/objects/items/weapons/flamethrower.dm
+3 -3
View File
@@ -135,7 +135,7 @@
usr.set_machine(src)
if(href_list["light"])
if(!ptank) return
if(ptank.air_contents.gas["phoron"] < 1) return
if(ptank.air_contents.gas[GAS_PHORON] < 1) return
if(!status) return
lit = !lit
if(lit)
@@ -184,8 +184,8 @@
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100))
//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is mischievious and I could probably make it work without fucking it up like this, but there you have it. -- TLE
new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target))
air_transfer.gas["phoron"] = 0
new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas[GAS_PHORON],get_dir(loc,target))
air_transfer.gas[GAS_PHORON] = 0
target.assume_air(air_transfer)
//Burn it based on transfered gas
//target.hotspot_expose(part4.air_contents.temperature*2,300)
code/game/objects/items/weapons/grenades/chem_grenade.dm
+20 -20
View File
@@ -213,9 +213,9 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("aluminum", 30)
B2.reagents.add_reagent("foaming_agent", 10)
B2.reagents.add_reagent("pacid", 10)
B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30)
B2.reagents.add_reagent(REAGENT_ID_FOAMINGAGENT, 10)
B2.reagents.add_reagent(REAGENT_ID_PACID, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -235,11 +235,11 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("aluminum", 15)
B1.reagents.add_reagent("fuel",20)
B2.reagents.add_reagent("phoron", 15)
B2.reagents.add_reagent("sacid", 15)
B1.reagents.add_reagent("fuel",20)
B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 15)
B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
B2.reagents.add_reagent(REAGENT_ID_PHORON, 15)
B2.reagents.add_reagent(REAGENT_ID_SACID, 15)
B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -258,10 +258,10 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("plantbgone", 25)
B1.reagents.add_reagent("potassium", 25)
B2.reagents.add_reagent("phosphorus", 25)
B2.reagents.add_reagent("sugar", 25)
B1.reagents.add_reagent(REAGENT_ID_PLANTBGONE, 25)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25)
B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -282,9 +282,9 @@
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
B2.reagents.add_reagent("water", 40)
B2.reagents.add_reagent("cleaner", 10)
B1.reagents.add_reagent(REAGENT_ID_FLUOROSURFACTANT, 40)
B2.reagents.add_reagent(REAGENT_ID_WATER, 40)
B2.reagents.add_reagent(REAGENT_ID_CLEANER, 10)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -304,11 +304,11 @@
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("phosphorus", 40)
B1.reagents.add_reagent("potassium", 40)
B1.reagents.add_reagent("condensedcapsaicin", 40)
B2.reagents.add_reagent("sugar", 40)
B2.reagents.add_reagent("condensedcapsaicin", 80)
B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
B1.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
B2.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 80)
detonator = new/obj/item/assembly_holder/timer_igniter(src)
code/game/objects/items/weapons/implants/implantreagent_vr.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "reagent generator implant"
desc = "This is an implant that has attached storage and generates a reagent."
implant_color = "r"
var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process()
var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent
var/list/generated_reagents = list(REAGENT_ID_WATER = 2) //Any number of reagents, the associated value is how many units are generated per process()
var/reagent_name = REAGENT_ID_WATER //What is shown when reagents are removed, doesn't need to be an actual reagent
var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick
var/transfer_amount = 30 //amount transferred when using verb
var/usable_volume = 120
code/game/objects/items/weapons/material/ashtray.dm
+3 -3
View File
@@ -95,10 +95,10 @@ var/global/list/ashtray_cache = list()
return ..()
/obj/item/material/ashtray/plastic/New(var/newloc)
..(newloc, "plastic")
..(newloc, MAT_PLASTIC)
/obj/item/material/ashtray/bronze/New(var/newloc)
..(newloc, "bronze")
..(newloc, MAT_BRONZE)
/obj/item/material/ashtray/glass/New(var/newloc)
..(newloc, "glass")
..(newloc,MAT_GLASS)
code/game/objects/items/weapons/material/bats.dm
+6 -6
View File
@@ -6,7 +6,7 @@
throwforce = 7
attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
hitsound = 'sound/weapons/genhit3.ogg'
default_material = "wood"
default_material = MAT_WOOD
force_divisor = 1.1 // 22 when wielded with weight 20 (steel)
unwielded_force_divisor = 0.7 // 15 when unwielded based on above.
dulled_divisor = 0.75 // A "dull" bat is still gonna hurt
@@ -14,16 +14,16 @@
//Predefined materials go here.
/obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
..(newloc,"steel")
..(newloc,MAT_STEEL)
/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc)
..(newloc,"uranium")
..(newloc,MAT_URANIUM)
/obj/item/material/twohanded/baseballbat/gold/New(var/newloc)
..(newloc,"gold")
..(newloc,MAT_GOLD)
/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc)
..(newloc,"platinum")
..(newloc,MAT_PLATINUM)
/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
..(newloc,"diamond")
..(newloc,MAT_DIAMOND)
code/game/objects/items/weapons/material/chainsaw.dm
+4 -4
View File
@@ -16,7 +16,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
START_PROCESSING(SSobj, src)
. = ..()
@@ -73,7 +73,7 @@
playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1)
if(A && on)
if(get_fuel() > 0)
reagents.remove_reagent("fuel", 1)
reagents.remove_reagent(REAGENT_ID_FUEL, 1)
if(istype(A,/obj/structure/window))
var/obj/structure/window/W = A
W.shatter()
@@ -103,14 +103,14 @@
if(on)
if(get_fuel() > 0)
reagents.remove_reagent("fuel", 1)
reagents.remove_reagent(REAGENT_ID_FUEL, 1)
playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1)
if(get_fuel() <= 0)
to_chat(usr, "\The [src] sputters to a stop!")
turnOff()
/obj/item/chainsaw/proc/get_fuel()
return reagents.get_reagent_amount("fuel")
return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/chainsaw/examine(mob/user)
. = ..()
code/game/objects/items/weapons/material/kitchen.dm
+6 -6
View File
@@ -143,7 +143,7 @@
edge = FALSE
/obj/item/material/kitchen/utensil/fork/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/obj/item/material/kitchen/utensil/foon
name = "foon"
@@ -153,7 +153,7 @@
edge = FALSE
/obj/item/material/kitchen/utensil/foon/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/obj/item/material/kitchen/utensil/spork
name = "spork"
@@ -163,7 +163,7 @@
edge = FALSE
/obj/item/material/kitchen/utensil/spork/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/obj/item/material/kitchen/utensil/spoon
name = "spoon"
@@ -175,7 +175,7 @@
force_divisor = 0.1 //2 when wielded with weight 20 (steel)
/obj/item/material/kitchen/utensil/spoon/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/*
* Knives
@@ -190,7 +190,7 @@
return ..()
*/
/obj/item/material/knife/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/*
* Rolling Pins
@@ -201,7 +201,7 @@
desc = "Used to knock out the " + JOB_BARTENDER+ "."
icon_state = "rolling_pin"
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
default_material = "wood"
default_material = MAT_WOOD
force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
dulled_divisor = 0.75 // Still a club
thrown_force_divisor = 1 // as above
code/game/objects/items/weapons/material/knives.dm
+3 -3
View File
@@ -126,7 +126,7 @@
force_divisor = 0.1
/obj/item/material/knife/table/plastic
default_material = "plastic"
default_material = MAT_PLASTIC
/obj/item/material/knife/butch
name = "butcher's cleaver"
@@ -143,7 +143,7 @@
attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
slot_flags = SLOT_BELT
default_material = "plasteel" //VOREStation Edit
default_material = MAT_PLASTEEL //VOREStation Edit
/obj/item/material/knife/machete/cyborg
name = "integrated machete"
@@ -157,7 +157,7 @@
icon_state = "survivalknife"
item_state = "knife"
applies_material_colour = FALSE
default_material = "plasteel" //VOREStation Edit
default_material = MAT_PLASTEEL //VOREStation Edit
toolspeed = 2 // Use a real axe if you want to chop logs.
/obj/item/material/knife/stone
code/game/objects/items/weapons/material/material_armor.dm
+4 -4
View File
@@ -271,10 +271,10 @@ Protectiveness | Armor %
material_slowdown_multiplier = 0.4
/obj/item/clothing/suit/armor/material/makeshift/durasteel
default_material = "durasteel"
default_material = MAT_DURASTEEL
/obj/item/clothing/suit/armor/material/makeshift/glass
default_material = "glass"
default_material = MAT_GLASS
// Used to craft sheet armor, and possibly other things in the Future(tm).
/obj/item/material/armor_plating
@@ -363,7 +363,7 @@ Protectiveness | Armor %
if(istype(O, /obj/item/stack/material))
var/obj/item/stack/material/S = O
if(S.material == get_material_by_name("leather"))
if(S.material == get_material_by_name(MAT_LEATHER))
if(S.use(2))
to_chat(user, span_notice("You curve the plate inwards, and add a strap for adjustment."))
user.drop_from_inventory(src)
@@ -411,4 +411,4 @@ Protectiveness | Armor %
icon_state = "material_armor_makeshift"
/obj/item/clothing/head/helmet/material/makeshift/durasteel
default_material = "durasteel"
default_material = MAT_DURASTEEL
code/game/objects/items/weapons/material/shards.dm
+3 -3
View File
@@ -13,7 +13,7 @@
thrown_force_divisor = 0.5
item_state = "shard-glass"
attack_verb = list("stabbed", "slashed", "sliced", "cut")
default_material = "glass"
default_material = MAT_GLASS
unbreakable = 1 //It's already broken.
drops_debris = 0
@@ -144,7 +144,7 @@
// Preset types - left here for the code that uses them
/obj/item/material/shard/shrapnel/New(loc)
..(loc, "steel")
..(loc, MAT_STEEL)
/obj/item/material/shard/phoron/New(loc)
..(loc, "borosilicate glass")
..(loc, MAT_PGLASS)
code/game/objects/items/weapons/material/thrown.dm
+1 -1
View File
@@ -21,4 +21,4 @@
M.adjustToxLoss(rand(20,40))
/obj/item/material/star/ninja
default_material = "uranium"
default_material = MAT_URANIUM
code/game/objects/items/weapons/material/twohanded.dm
+1 -1
View File
@@ -157,7 +157,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
mob_throw_hit_sound = 'sound/weapons/pierce.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
default_material = "glass"
default_material = MAT_GLASS
applies_material_colour = 0
fragile = 1 //It's a haphazard thing of glass, wire, and steel
reach = 2 // Spears are long.
code/game/objects/items/weapons/mop_deploy.dm
+1 -1
View File
@@ -20,7 +20,7 @@
START_PROCESSING(SSobj, src)
/turf/proc/clean_deploy(atom/source)
if(source.reagents.has_reagent("water", 1))
if(source.reagents.has_reagent(REAGENT_ID_WATER, 1))
clean_blood()
if(istype(src, /turf/simulated))
var/turf/simulated/T = src
code/game/objects/items/weapons/paint.dm
+1 -1
View File
@@ -29,7 +29,7 @@ var/global/list/cached_icons = list()
/obj/item/reagent_containers/glass/paint/Initialize()
.=..()
if(paint_type)
reagents.add_reagent("paint", volume, paint_type)
reagents.add_reagent(REAGENT_ID_PAINT, volume, paint_type)
/obj/item/reagent_containers/glass/paint/red
icon_state = "paint_red"
code/game/objects/items/weapons/storage/bags.dm
+20 -20
View File
@@ -108,26 +108,26 @@
var/current_capacity = 0
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
var/list/stored_ore = list(
"sand" = 0,
"hematite" = 0,
"carbon" = 0,
"raw copper" = 0,
"raw tin" = 0,
"void opal" = 0,
"painite" = 0,
"quartz" = 0,
"raw bauxite" = 0,
"phoron" = 0,
"silver" = 0,
"gold" = 0,
"marble" = 0,
"uranium" = 0,
"diamond" = 0,
"platinum" = 0,
"lead" = 0,
"mhydrogen" = 0,
"verdantium" = 0,
"rutile" = 0)
ORE_SAND = 0,
ORE_HEMATITE = 0,
ORE_CARBON = 0,
ORE_COPPER = 0,
ORE_TIN = 0,
ORE_VOPAL = 0,
ORE_PAINITE = 0,
ORE_QUARTZ = 0,
ORE_BAUXITE = 0,
ORE_PHORON = 0,
ORE_SILVER = 0,
ORE_GOLD = 0,
ORE_MARBLE = 0,
ORE_URANIUM = 0,
ORE_DIAMOND = 0,
ORE_PLATINUM = 0,
ORE_LEAD = 0,
ORE_MHYDROGEN = 0,
ORE_VERDANTIUM = 0,
ORE_RUTILE = 0)
var/last_update = 0
/obj/item/storage/bag/ore/holding
code/game/objects/items/weapons/storage/bible.dm
+4 -4
View File
@@ -103,11 +103,11 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
/obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity) return
if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder
to_chat(user, span_notice("You bless [A]."))
var/water2holy = A.reagents.get_reagent_amount("water")
A.reagents.del_reagent("water")
A.reagents.add_reagent("holywater",water2holy)
var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
A.reagents.del_reagent(REAGENT_ID_WATER)
A.reagents.add_reagent(REAGENT_ID_HOLYWATER,water2holy)
/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)
if (src.use_sound)
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -50,7 +50,7 @@
/obj/item/storage/fancy/egg_box
icon = 'icons/obj/food.dmi'
icon_state = "eggbox"
icon_type = "egg"
icon_type = REAGENT_ID_EGG
name = "egg box"
center_of_mass = list("x" = 16,"y" = 7)
storage_slots = 12
code/game/objects/items/weapons/storage/firstaid_vr.dm
+20 -20
View File
@@ -154,7 +154,7 @@
/obj/item/reagent_containers/pill/copper = 5)
/obj/item/storage/pill_bottle/adminordrazine
name = "pill bottle (Adminordrazine)"
name = "pill bottle (" + REAGENT_ADMINORDRAZINE + ")"
desc = "It's magic. We don't have to explain it."
starts_with = list(/obj/item/reagent_containers/pill/adminordrazine = 21)
@@ -164,37 +164,37 @@
starts_with = list(/obj/item/reagent_containers/pill/nutriment = 7, /obj/item/reagent_containers/pill/protein = 7)
/obj/item/storage/pill_bottle/rezadone
name = "pill bottle (Rezadone)"
name = "pill bottle (" + REAGENT_REZADONE + ")"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/reagent_containers/pill/rezadone = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/peridaxon
name = "pill bottle (Peridaxon)"
name = "pill bottle (" + REAGENT_PERIDAXON + ")"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/reagent_containers/pill/peridaxon = 14)
wrapper_color = COLOR_PURPLE
/obj/item/storage/pill_bottle/carthatoline
name = "pill bottle (Carthatoline)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
name = "pill bottle (" + REAGENT_CARTHATOLINE + ")"
desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/reagent_containers/pill/carthatoline = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/storage/pill_bottle/alkysine
name = "pill bottle (Alkysine)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
name = "pill bottle (" + REAGENT_ALKYSINE + ")"
desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/reagent_containers/pill/alkysine = 14)
wrapper_color = COLOR_YELLOW
/obj/item/storage/pill_bottle/imidazoline
name = "pill bottle (Imidazoline)"
name = "pill bottle (" + REAGENT_IMIDAZOLINE + ")"
desc = "Heals eye damage."
starts_with = list(/obj/item/reagent_containers/pill/imidazoline = 14)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/storage/pill_bottle/osteodaxon
name = "pill bottle (Osteodaxon)"
name = "pill bottle (" + REAGENT_OSTEODAXON + ")"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/reagent_containers/pill/osteodaxon = 14)
wrapper_color = COLOR_WHITE
@@ -206,36 +206,36 @@
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/storage/pill_bottle/hyronalin
name = "pill bottle (Hyronalin)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
name = "pill bottle (" + REAGENT_HYRONALIN + ")"
desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/hyronalin = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/arithrazine
name = "pill bottle (Arithrazine)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
name = "pill bottle (" + REAGENT_ARITHRAZINE + ")"
desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/reagent_containers/pill/arithrazine = 14)
wrapper_color = COLOR_TEAL
/obj/item/storage/pill_bottle/corophizine
name = "pill bottle (Corophizine)"
name = "pill bottle (" + REAGENT_COROPHIZINE + ")"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/reagent_containers/pill/corophizine = 14)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/storage/pill_bottle/vermicetol
name = "pill bottle (Vermicetol)"
name = "pill bottle (" + REAGENT_VERMICETOL + ")"
desc = "Contains pills used to stabilize the extremely injured."
starts_with = list(/obj/item/reagent_containers/pill/vermicetol = 14)
wrapper_color = COLOR_MAROON
/obj/item/storage/pill_bottle/healing_nanites
name = "pill bottle (Healing nanites)"
name = "pill bottle (" + REAGENT_HEALINGNANITES + ")"
desc = "Miniature medical robots that swiftly restore bodily damage."
starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
/obj/item/storage/pill_bottle/sleevingcure
name = "pill bottle (resleeving sickness cure)"
name = "pill bottle (" + REAGENT_SLEEVINGCURE + ")"
desc = "A rare cure provided by Vey-Medical that helps counteract negative side effects of using imperfect resleeving machinery."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7)
@@ -250,18 +250,18 @@
can_hold = list(/obj/item/reagent_containers/pill)
/obj/item/storage/mrebag/pill/sleevingcure
name = "vacuum-sealed pill (resleeving sickness cure)"
name = "vacuum-sealed pill (" + REAGENT_SLEEVINGCURE + ")"
desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure)
/obj/item/storage/pill_bottle/paracetamol
name = "pill bottle (Paracetamol)"
name = "pill bottle (" + REAGENT_PARACETAMOL + ")"
desc = "Contains over the counter medicine to treat pain."
starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 14)
wrapper_color = COLOR_GRAY
/obj/item/storage/pill_bottle/dexalin
name = "pill bottle (Dexalin)"
name = "pill bottle (" + REAGENT_DEXALIN + ")"
desc = "Contains pills used to treat oxygen deprivation."
starts_with = list(/obj/item/reagent_containers/pill/dexalin = 14)
wrapper_color = "#3366cc"
code/game/objects/items/weapons/storage/mre.dm
+4 -4
View File
@@ -364,19 +364,19 @@ MRE Stuff
if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders")
icon_state = "tgmcmre_entree"
nutriment_amt = 5
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("meatballs", "cheese spread", "beef turnover", "mashed potatoes")
icon_state = "tgmcmre_side"
nutriment_amt = 3
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1)
if("biscuit", "pretzels", "peanuts", "cracker")
icon_state = "tgmcmre_snack"
nutriment_amt = 2
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar")
icon_state = "tgmcmre_dessert"
nutriment_amt = 2
starts_with = list("sugar" = 1)
starts_with = list(REAGENT_ID_SUGAR = 1)
package_open_state = "tgmcmre_[flavor]"
nutriment_desc = list("[new_taste]" = nutriment_amt)
code/game/objects/items/weapons/storage/uplink_kits.dm
+7 -7
View File
@@ -196,31 +196,31 @@
var/obj/item/storage/fancy/cigarettes/pack
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
fill_cigarre_package(pack, list("potassium" = 1.5, "nitrogen" = 1.5, "silicon" = 1.5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5))
// Mindbreaker
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5))
pack.desc += " 'MB' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
pack.reagents.add_reagent("tricordrazine", 15 * pack.storage_slots)
pack.reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 15 * pack.storage_slots)
pack.desc += " 'T' has been scribbled on it."
new /obj/item/flame/lighter/zippo(src)
code/game/objects/items/weapons/tanks/jetpack.dm
+4 -4
View File
@@ -92,7 +92,7 @@
/obj/item/tank/jetpack/void/Initialize()
. = ..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/oxygen
name = "jetpack (oxygen)"
@@ -102,7 +102,7 @@
/obj/item/tank/jetpack/oxygen/Initialize()
. = ..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/breaker
name = "CSC industrial jetpack"
@@ -112,7 +112,7 @@
/obj/item/tank/jetpack/breaker/Initialize()
. = ..()
air_contents.adjust_gas("volatile_fuel", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_VOLATILE_FUEL, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/carbondioxide
name = "jetpack (carbon dioxide)"
@@ -123,7 +123,7 @@
/obj/item/tank/jetpack/carbondioxide/Initialize()
. = ..()
air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_CO2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/jetpack/rig
name = "jetpack"
code/game/objects/items/weapons/tanks/tank_types.dm
+17 -17
View File
@@ -18,11 +18,11 @@
/obj/item/tank/oxygen/Initialize()
. = ..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/oxygen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 10))
if(loc == user && (air_contents.gas[GAS_O2] < 10))
. += span_warning("The meter on \the [src] indicates you are almost out of oxygen!")
/obj/item/tank/oxygen/yellow
@@ -44,8 +44,8 @@
/obj/item/tank/anesthetic/Initialize()
. = ..()
air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
air_contents.gas["nitrous_oxide"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
air_contents.gas[GAS_O2] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
air_contents.gas[GAS_N2O] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
air_contents.update_values()
/*
@@ -58,13 +58,13 @@
/obj/item/tank/air/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 1))
if(loc == user && (air_contents.gas[GAS_O2] < 1))
. += span_warning("The meter on \the [src] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
/obj/item/tank/air/Initialize()
. = ..()
src.air_contents.adjust_multi("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, "nitrogen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
src.air_contents.adjust_multi(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, GAS_N2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
/*
* Phoron
@@ -78,7 +78,7 @@
/obj/item/tank/phoron/Initialize()
. = ..()
src.air_contents.adjust_gas("phoron", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_PHORON, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/phoron/attackby(obj/item/W as obj, mob/user as mob)
..()
@@ -102,7 +102,7 @@
/obj/item/tank/vox/Initialize()
. = ..()
air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit
/obj/item/tank/phoron/pressurized
name = "fuel can"
@@ -112,7 +112,7 @@
/obj/item/tank/phoron/pressurized/Initialize()
. = ..()
adjust_scale(0.8)
air_contents.adjust_gas("phoron", (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_PHORON, (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/*
* Emergency Oxygen
@@ -137,11 +137,11 @@
/obj/item/tank/emergency/oxygen/Initialize()
. = ..()
src.air_contents.adjust_gas("oxygen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_O2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/oxygen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 0.2))
if(loc == user && (air_contents.gas[GAS_O2] < 0.2))
. += span_danger("The meter on the [src.name] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
@@ -165,7 +165,7 @@
/obj/item/tank/stasis/oxygen/Initialize()
. = ..()
src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_O2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/nitrogen
name = "emergency nitrogen tank"
@@ -175,7 +175,7 @@
/obj/item/tank/emergency/nitrogen/Initialize()
. = ..()
src.air_contents.adjust_gas("nitrogen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_N2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/nitrogen/double
name = "double emergency nitrogen tank"
@@ -191,7 +191,7 @@
/obj/item/tank/emergency/phoron/Initialize()
. = ..()
src.air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/phoron/double
name = "double emergency phoron tank"
@@ -210,11 +210,11 @@
/obj/item/tank/nitrogen/Initialize()
. = ..()
src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
src.air_contents.adjust_gas(GAS_N2, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/nitrogen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["nitrogen"] < 10))
if(loc == user && (air_contents.gas[GAS_N2] < 10))
. += span_danger("The meter on \the [src] indicates you are almost out of nitrogen!")
//playsound(user, 'sound/effects/alert.ogg', 50, 1)
@@ -227,4 +227,4 @@
/obj/item/tank/stasis/nitro_cryo/Initialize()
. = ..()
src.air_contents.adjust_gas_temp("nitrogen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C)
src.air_contents.adjust_gas_temp(GAS_N2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C)
code/game/objects/items/weapons/tanks/tank_types_vr.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/item/tank/emergency/phoron/double/New()
..()
air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
//New icons
/obj/item/tank/oxygen
code/game/objects/items/weapons/tanks/tanks.dm
+2 -2
View File
@@ -546,8 +546,8 @@ var/list/global/tank_gauge_cache = list()
oxygen_amt = 4.5
src.air_contents.gas["phoron"] = phoron_amt
src.air_contents.gas["oxygen"] = oxygen_amt
src.air_contents.gas[GAS_PHORON] = phoron_amt
src.air_contents.gas[GAS_O2] = oxygen_amt
src.air_contents.update_values()
src.valve_welded = 1
src.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE-1
code/game/objects/items/weapons/tools/weldingtool.dm
+5 -5
View File
@@ -49,7 +49,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
update_icon()
if(always_process)
START_PROCESSING(SSobj, src)
@@ -185,7 +185,7 @@
//Returns the amount of fuel in the welder
/obj/item/weldingtool/proc/get_fuel()
return reagents.get_reagent_amount("fuel")
return reagents.get_reagent_amount(REAGENT_ID_FUEL)
/obj/item/weldingtool/proc/get_max_fuel()
return max_fuel
@@ -197,7 +197,7 @@
if(amount)
burned_fuel_for = 0 // Reset the counter since we're removing fuel.
if(get_fuel() >= amount)
reagents.remove_reagent("fuel", amount)
reagents.remove_reagent(REAGENT_ID_FUEL, amount)
if(M)
eyecheck(M)
update_icon()
@@ -440,7 +440,7 @@
/obj/item/weldingtool/alien/process()
if(get_fuel() <= get_max_fuel())
reagents.add_reagent("fuel", 1)
reagents.add_reagent(REAGENT_ID_FUEL, 1)
..()
/obj/item/weldingtool/experimental
@@ -461,7 +461,7 @@
..()
if(get_fuel() < get_max_fuel() && nextrefueltick < world.time)
nextrefueltick = world.time + 10
reagents.add_reagent("fuel", 1)
reagents.add_reagent(REAGENT_ID_FUEL, 1)
/obj/item/weldingtool/experimental/hybrid
name = "strange welding tool"
code/game/objects/items/weapons/weldbackpack.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
R.add_reagent(REAGENT_ID_FUEL, max_fuel)
nozzle = new nozzle_type(src)
nozzle_attached = 1
code/game/objects/structures/barricades.dm
+3 -3
View File
@@ -13,7 +13,7 @@
/obj/structure/barricade/New(var/newloc, var/material_name)
..(newloc)
if(!material_name)
material_name = "wood"
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
@@ -72,7 +72,7 @@
/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_CLOTH) || get_material_by_name(MAT_SYNCLOTH)))
playsound(src, 'sound/items/drop/clothing.ogg', 100, 1)
@@ -118,7 +118,7 @@
/obj/structure/barricade/sandbag/New(var/newloc, var/material_name)
if(!material_name)
material_name = "cloth"
material_name = MAT_CLOTH
..(newloc, material_name)
material = get_material_by_name("[material_name]")
if(!material)
code/game/objects/structures/bonfire.dm
+2 -2
View File
@@ -150,7 +150,7 @@
/obj/structure/bonfire/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
if(G.gas["oxygen"] < 1)
if(G.gas[GAS_O2] < 1)
return FALSE
return TRUE
@@ -345,7 +345,7 @@
/obj/structure/fireplace/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
if(G.gas["oxygen"] < 1)
if(G.gas[GAS_O2] < 1)
return FALSE
return TRUE
code/game/objects/structures/crates_lockers/closets/coffin.dm
+1 -1
View File
@@ -149,7 +149,7 @@
return PROJECTILE_CONTINUE // It's a hole in the ground, doesn't usually stop or even care about bullets
/obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
var/gasid = "carbon_dioxide"
var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.exhale_type)
code/game/objects/structures/door_assembly.dm
+2 -2
View File
@@ -267,7 +267,7 @@
var/material_name = S.get_material_name()
if (S)
if (S.get_amount() >= 1)
if(material_name == "rglass")
if(material_name == MAT_RGLASS)
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && !glass)
@@ -276,7 +276,7 @@
glass = 1
else if(material_name)
// Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z
if(!(material_name in list("gold", "silver", "diamond", "uranium", "phoron", "sandstone")))
if(!(material_name in list(MAT_GOLD, MAT_SILVER, MAT_DIAMOND, MAT_URANIUM, MAT_PHORON, MAT_SANDSTONE)))
to_chat(user, "You cannot make an airlock out of that material.")
return
if(S.get_amount() >= 2)
code/game/objects/structures/droppod.dm
+2 -2
View File
@@ -141,5 +141,5 @@
/datum/gas_mixture/pod_air/New()
. = ..()
gas = list(
"oxygen" = 21,
"nitrogen" = 79)
GAS_O2 = 21,
GAS_N2 = 79)
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -363,7 +363,7 @@
max_health = 225
health = 225
cover = 60
girder_material = "resin"
girder_material = MAT_RESIN
/obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
var/turf/simulated/T = get_turf(src)
code/game/objects/structures/gravemarker.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/structure/gravemarker/New(var/newloc, var/material_name)
..(newloc)
if(!material_name)
material_name = "wood"
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
code/game/objects/structures/medical_stand_vr.dm
+1 -1
View File
@@ -423,7 +423,7 @@
return
// If the human is losing too much blood, beep.
if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe)
if(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < H.species.blood_volume*H.species.blood_level_safe)
visible_message("\The [src] beeps loudly.")
var/datum/reagent/B = H.take_blood(beaker,amount)
code/game/objects/structures/simple_doors.dm
+11 -11
View File
@@ -177,7 +177,7 @@
else if(istype(W,/obj/item) && breakable) //not sure, can't not just weapons get passed to this proc?
hardness -= W.force/10
visible_message(span_danger("[user] hits [src] with [W]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
@@ -202,7 +202,7 @@
/obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name("resin"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
@@ -242,25 +242,25 @@
SSradiation.radiate(src, round(material.radioactivity/3))
/obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
..(mapload, material_name || "iron")
..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
..(mapload, material_name || "silver")
..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
..(mapload, material_name || "gold")
..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
..(mapload, material_name || "uranium")
..(mapload, material_name || MAT_URANIUM)
/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
..(mapload, material_name || "sandstone")
..(mapload, material_name || MAT_SANDSTONE)
/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
..(mapload, material_name || "phoron")
..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
..(mapload, material_name || "diamond")
..(mapload, material_name || MAT_DIAMOND)
/obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
..(mapload, material_name || MAT_WOOD)
@@ -273,10 +273,10 @@
..(mapload, material_name || MAT_SIFWOOD)
/obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
..(mapload, material_name || "resin")
..(mapload, material_name || MAT_RESIN)
/obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
..(mapload, material_name || "cult")
..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/cult/TryToSwitchState(atom/user)
if(isliving(user))
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+4 -4
View File
@@ -104,7 +104,7 @@
return
var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
if(istype(W,/obj/item/stack/tile/carpet))
padding_type = "carpet"
padding_type = MAT_CARPET
else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.material && (M.material.flags & MATERIAL_PADDING))
@@ -200,10 +200,10 @@
base_icon = "psychbed"
/obj/structure/bed/psych/New(var/newloc)
..(newloc,"wood","leather")
..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/padded/New(var/newloc)
..(newloc,"plastic","cotton")
..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/double
name = "double bed"
@@ -211,7 +211,7 @@
base_icon = "doublebed"
/obj/structure/bed/double/padded/New(var/newloc)
..(newloc,"wood","cotton")
..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+64 -64
View File
@@ -131,34 +131,34 @@
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "teal")
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "black")
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "green")
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/purp/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "purple")
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "blue")
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "beige")
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "lime")
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "yellow")
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "orange")
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
@@ -170,34 +170,34 @@
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "teal")
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "black")
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "green")
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "purple")
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "blue")
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "beige")
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "lime")
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "yellow")
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "orange")
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
anchored = FALSE
@@ -278,7 +278,7 @@
..()
/obj/structure/bed/chair/wood/New(var/newloc)
..(newloc, "wood")
..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
@@ -292,7 +292,7 @@
base_icon = "sofamiddle"
icon_state = "sofamiddle"
applies_material_colour = 1
var/sofa_material = "carpet"
var/sofa_material = MAT_CARPET
var/corner_piece = FALSE
/obj/structure/bed/chair/sofa/update_icon()
@@ -300,7 +300,7 @@
var/datum/material/color_material = get_material_by_name(sofa_material)
color = color_material.icon_colour
if(sofa_material == "carpet")
if(sofa_material == MAT_CARPET)
name = "red [initial(name)]"
else
name = "[sofa_material] [initial(name)]"
@@ -415,37 +415,37 @@
//color variations
//Middle sofas first
/obj/structure/bed/chair/sofa
sofa_material = "carpet"
sofa_material = MAT_CARPET
/obj/structure/bed/chair/sofa/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
//sofa directions
@@ -459,91 +459,91 @@
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/left/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/right/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/corner/brown
sofa_material = "leather"
sofa_material = MAT_LEATHER
/obj/structure/bed/chair/sofa/left/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/right/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/corner/teal
sofa_material = "teal"
sofa_material = MAT_CLOTH_TEAL
/obj/structure/bed/chair/sofa/left/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/right/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/corner/black
sofa_material = "black"
sofa_material = MAT_CLOTH_BLACK
/obj/structure/bed/chair/sofa/left/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/right/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/corner/green
sofa_material = "green"
sofa_material = MAT_CLOTH_GREEN
/obj/structure/bed/chair/sofa/left/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/right/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/corner/purp
sofa_material = "purple"
sofa_material = MAT_CLOTH_PURPLE
/obj/structure/bed/chair/sofa/left/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/right/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/corner/blue
sofa_material = "blue"
sofa_material = MAT_CLOTH_BLUE
/obj/structure/bed/chair/sofa/left/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/right/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/corner/beige
sofa_material = "beige"
sofa_material = MAT_CLOTH_BEIGE
/obj/structure/bed/chair/sofa/left/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/right/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/corner/lime
sofa_material = "lime"
sofa_material = MAT_CLOTH_LIME
/obj/structure/bed/chair/sofa/left/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/right/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/corner/yellow
sofa_material = "yellow"
sofa_material = MAT_CLOTH_YELLOW
/obj/structure/bed/chair/sofa/left/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
/obj/structure/bed/chair/sofa/right/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
/obj/structure/bed/chair/sofa/corner/orange
sofa_material = "orange"
sofa_material = MAT_CLOTH_ORANGE
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+22 -22
View File
@@ -123,34 +123,34 @@
buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "carpet")
..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "leather")
..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "teal")
..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "black")
..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "green")
..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "purple")
..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "blue")
..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "beige")
..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "lime")
..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "yellow")
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
name = "comfy mounted chair"
@@ -159,34 +159,34 @@
base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "carpet")
..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "leather")
..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "teal")
..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "black")
..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "green")
..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "purple")
..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "blue")
..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "beige")
..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "lime")
..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, new_material, "yellow")
..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
name = "captain chair"
@@ -202,7 +202,7 @@
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, "blue")
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
name = "shuttle seat"
@@ -211,7 +211,7 @@
icon_state = "shuttle_chair_preview"
buckle_movable = 0
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = "blue"
var/padding = MAT_CLOTH_BLUE
/obj/structure/bed/chair/bay/shuttle/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, padding)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+2 -2
View File
@@ -32,7 +32,7 @@ var/global/list/stool_cache = list() //haha stool
update_icon()
/obj/item/stool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/item/stool/update_icon()
// Prep icon.
@@ -125,7 +125,7 @@ var/global/list/stool_cache = list() //haha stool
return
var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
if(istype(W,/obj/item/stack/tile/carpet))
padding_type = "carpet"
padding_type = MAT_CARPET
else if(istype(W,/obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.material && (M.material.flags & MATERIAL_PADDING))
code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+1 -1
View File
@@ -15,4 +15,4 @@
icon_state = "bar_stool_padded_preview" //set for the map
/obj/item/stool/baystool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "carpet")
..(newloc, MAT_STEEL, MAT_CARPET)
code/game/objects/structures/tank_dispenser.dm
+2 -2
View File
@@ -57,7 +57,7 @@
/obj/structure/dispenser/tgui_data(mob/user)
var/list/data = list()
data["oxygen"] = oxygentanks
data["plasma"] = phorontanks
data["phoron"] = phorontanks
return data
@@ -102,7 +102,7 @@
if(..())
return
switch(action)
if("plasma")
if("phoron")
var/obj/item/tank/phoron/tank = locate() in src
if(tank && Adjacent(ui.user))
ui.user.put_in_hands(tank)
code/game/objects/structures/transit_tubes.dm
+1 -1
View File
@@ -81,7 +81,7 @@
/obj/structure/transit_tube_pod/New(loc)
..(loc)
air_contents.adjust_multi("oxygen", MOLES_O2STANDARD * 2, "nitrogen", MOLES_N2STANDARD)
air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
air_contents.temperature = T20C
// Give auto tubes time to align before trying to start moving
code/game/objects/structures/watercloset.dm
+4 -4
View File
@@ -216,7 +216,7 @@
mymist = null
if(on)
add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
add_overlay(image('icons/obj/watercloset.dmi', src, REAGENT_ID_WATER, MOB_LAYER + 1, dir))
if(temperature_settings[watertemp] < T20C)
return //no mist for cold water
if(!ismist)
@@ -265,7 +265,7 @@
var/mob/living/L = AM
process_heat(L)
wash_floor()
reagents.add_reagent("water", reagents.get_free_space())
reagents.add_reagent(REAGENT_ID_WATER, reagents.get_free_space())
/obj/machinery/shower/proc/wash_floor()
if(is_washing)
@@ -588,7 +588,7 @@
var/obj/item/reagent_containers/RG = O
if (istype(RG) && RG.is_open_container())
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
RG.reagents.add_reagent(REAGENT_ID_WATER, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src]."))
playsound(src, 'sound/effects/sink.ogg', 75, 1)
return 1
@@ -612,7 +612,7 @@
span_userdanger("[user] was stunned by [TU.his] wet [O]!"))
return 1
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent("water", 5)
O.reagents.add_reagent(REAGENT_ID_WATER, 5)
to_chat(user, span_notice("You wet \the [O] in \the [src]."))
playsound(src, 'sound/effects/slosh.ogg', 25, 1)
return