cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup the last

Browse Source
This commit is contained in:
Kashargul
2024-12-08 20:54:28 +01:00
parent 99f21e40a3
commit 8d6bf161a8
76 changed files with 356 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/_reagents.dm
+17
View File
@@ -75,6 +75,10 @@
#define REAGENT_ID_TUNGSTEN "tungsten"
#define REAGENT_NUTRIMENT "Nutriment"
#define REAGENT_ID_NUTRIMENT "nutriment"
#define REAGENT_STEEL "Liquid Steel"
#define REAGENT_ID_STEEL "steel"
#define REAGENT_PLASTEEL "Liquid Plasteel"
#define REAGENT_ID_PLASTEEL "plasteel"
// Xeno chem react
@@ -1327,3 +1331,16 @@
#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites"
#define REAGENT_SALMONELLA "Salmonella"
#define REAGENT_ID_SALMONELLA "salmonella"
#define REAGENT_METAMORPHIC "Metamorphic Metal"
#define REAGENT_ID_METAMORPHIC "metamorphic"
#define REAGENT_BINDING "Binding Metal"
#define REAGENT_ID_BINDING "binding"
// Xenoslimes
#define REAGENT_SLIMEBLEEDFIXER "Agent A"
#define REAGENT_ID_SLIMEBLEEDFIXER "slime_bleed_fixer"
#define REAGENT_SLIMEBONEFIXER "Agent B"
#define REAGENT_ID_SLIMEBONEFIXER "slime_bone_fixer"
#define REAGENT_SLIMEORGANFIXER "Agent C"
#define REAGENT_ID_SLIMEORGANFIXER "slime_organ_fixer"
code/__defines/materials.dm
+22 -7
View File
@@ -18,7 +18,7 @@
#define MAT_LOG "log"
#define MAT_SIFWOOD "alien wood"
#define MAT_SIFLOG "alien log"
#define MAT_HARDWOOD "hardwood"
#define MAT_HARDWOOD "hardwood"
#define MAT_HARDLOG "hardwood log"
#define MAT_STEELHULL "steel hull"
#define MAT_PLASTEEL "plasteel"
@@ -35,15 +35,10 @@
#define MAT_METALHYDROGEN "mhydrogen"
#define MAT_OSMIUM "osmium"
#define MAT_GRAPHITE "graphite"
#define MAT_LEATHER "leather"
#define MAT_CHITIN "chitin"
#define MAT_ALIENCHITIN "alien chitin"
#define MAT_ALIENCLAW "alien claw"
#define MAT_CLOTH "cloth"
#define MAT_FUR "fur"
#define MAT_SYNCLOTH "syncloth"
#define MAT_FIBERS "fibers"
#define MAT_WOOL "wool"
#define MAT_COPPER "copper"
#define MAT_QUARTZ "quartz"
#define MAT_TIN "tin"
@@ -51,7 +46,6 @@
#define MAT_ALUMINIUM "aluminium"
#define MAT_BRONZE "bronze"
#define MAT_PAINITE "painite"
#define MAT_BOROSILICATE "borosilicate glass"
#define MAT_SANDSTONE "sandstone"
#define MAT_FLINT "flint"
#define MAT_PLATINUM "platinum"
@@ -62,10 +56,31 @@
#define MAT_GRASS "grass"
#define MAT_RESIN "resin"
#define MAT_CULT "cult"
#define MAT_CULT2 "cult2"
#define MAT_ALIENALLOY "alienalloy"
#define MAT_COMPOSITE "composite"
#define MAT_BIOMASS "biomass"
#define MAT_WEEDEXTRACT "weed extract"
#define MAT_CARDBOARD "cardboard"
#define MAT_COTTON "cotton"
// cloth materials
#define MAT_WOOL "wool"
#define MAT_FIBERS "fibers"
#define MAT_LEATHER "leather"
#define MAT_CLOTH "cloth"
#define MAT_SYNCLOTH "syncloth"
#define MAT_CARPET "carpet"
// colours
#define MAT_CLOTH_TEAL "teal"
#define MAT_CLOTH_BLACK "black"
#define MAT_CLOTH_GREEN "green"
#define MAT_CLOTH_PURPLE "purple"
#define MAT_CLOTH_BLUE "blue"
#define MAT_CLOTH_BEIGE "beige"
#define MAT_CLOTH_LIME "lime"
#define MAT_CLOTH_YELLOW "yellow"
#define MAT_CLOTH_ORANGE "orange"
#define DEFAULT_TABLE_MATERIAL MAT_PLASTIC
code/datums/diseases/anxiety.dm
+1 -1
View File
@@ -4,7 +4,7 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cure_text = REAGENT_ETHANOL
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Lepdopticides"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
code/datums/diseases/beesease.dm
+1 -1
View File
@@ -4,7 +4,7 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Sugar"
cure_text = REAGENT_SUGAR
cures = list(REAGENT_ID_SUGAR)
agent = "Apidae Infection"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
code/datums/diseases/cold.dm
+1 -1
View File
@@ -3,7 +3,7 @@
max_stages = 3
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
cure_text = "Rest & " + REAGENT_SPACEACILLIN
cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
code/datums/diseases/fake_gbs.dm
+2 -2
View File
@@ -3,8 +3,8 @@
max_stages = 5
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
cures = list(REAGENT_ID_ADRANOL, "sulfur")
cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
agent = "Gravitokinetic Bipotential SADS-"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "if left untreated death will occur."
code/datums/diseases/gbs.dm
+2 -2
View File
@@ -3,8 +3,8 @@
max_stages = 5
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Adranol & Sulfur"
cures = list(REAGENT_ID_ADRANOL, "sulfur")
cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
cure_chance = 15
agent = "Gravitokinetic Bipotential SADS+"
viable_mobtypes = list(/mob/living/carbon/human)
code/datums/diseases/lycancoughy.dm
+1 -1
View File
@@ -4,7 +4,7 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
cure_text = "Ethanol"
cure_text = REAGENT_ETHANOL
cures = list(REAGENT_ID_ETHANOL)
agent = "Excess Snuggles"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
code/datums/diseases/magnitis.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Magnitis"
max_stages = 4
spread_text = "Airbone"
cure_text = "Iron"
cure_text = REAGENT_IRON
cures = list(REAGENT_ID_IRON)
agent = "Fukkos Miracos"
viable_mobtypes = list(/mob/living/carbon/human)
code/game/gamemodes/cult/cultify/obj.dm
+2 -2
View File
@@ -131,8 +131,8 @@
// Make it a wood-reinforced wooden table.
// There are cult materials available, but it'd make the table non-deconstructable with how holotables work.
// Could possibly use a new material var for holographic-ness?
material = get_material_by_name("wood")
reinforced = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
reinforced = get_material_by_name(MAT_WOOD)
update_desc()
update_connections(1)
update_icon()
code/game/machinery/computer/ai_core.dm
+1 -1
View File
@@ -94,7 +94,7 @@
icon_state = "2"
new /obj/item/stack/cable_coil(loc, 5)
if(istype(P, /obj/item/stack/material) && P.get_material_name() == "rglass")
if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_RGLASS)
var/obj/item/stack/RG = P
if (RG.get_amount() < 2)
to_chat(user, span_warning("You need two sheets of glass to put in the glass panel."))
code/game/machinery/computer/buildandrepair.dm
+1 -1
View File
@@ -87,7 +87,7 @@
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
A.amount = 5
if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass")
if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_GLASS)
var/obj/item/stack/G = P
if (G.get_amount() < 2)
to_chat(user, span_warning("You need two sheets of glass to put in the glass panel."))
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens)
var/static/icon/mask = icon('icons/obj/entertainment_monitor.dmi', "mask")
add_overlay("glass")
add_overlay(MAT_GLASS)
pinboard = new()
pinboard.icon = icon
code/game/machinery/doors/blast_door.dm
+2 -2
View File
@@ -42,7 +42,7 @@
/obj/machinery/door/blast/Initialize()
. = ..()
implicit_material = get_material_by_name("plasteel")
implicit_material = get_material_by_name(MAT_PLASTEEL)
/obj/machinery/door/blast/get_material()
return implicit_material
@@ -183,7 +183,7 @@
take_damage(W.force*0.35) //it's a blast door, it should take a while. -Luke
return
else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "plasteel") // Repairing.
else if(istype(C, /obj/item/stack/material) && C.get_material_name() == MAT_PLASTEEL) // Repairing.
var/amt = CEILING((maxhealth - health)/150, 1)
if(!amt)
to_chat(user, span_notice("\The [src] is already fully repaired."))
code/game/machinery/doors/door_vr.dm
+1 -1
View File
@@ -42,7 +42,7 @@
// Returns true only if one of the actions unique to reinforcing is done, otherwise false and continuing normal attackby
/obj/machinery/door/proc/attackby_vr(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/stack/material) && I.get_material_name() == "plasteel")
if(istype(I, /obj/item/stack/material) && I.get_material_name() == MAT_PLASTEEL)
if(heat_proof)
to_chat(user, span_warning("\The [src] is already reinforced."))
return TRUE
code/game/machinery/doors/firedoor_assembly.dm
+1 -1
View File
@@ -83,7 +83,7 @@
return
else
to_chat(user, span_notice("You need more welding fuel."))
else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "rglass" && !glass)
else if(istype(C, /obj/item/stack/material) && C.get_material_name() == MAT_RGLASS && !glass)
var/obj/item/stack/S = C
if (S.get_amount() >= 1)
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
code/game/machinery/frame.dm
+1 -1
View File
@@ -545,7 +545,7 @@
state = FRAME_FASTENED
new /obj/item/stack/cable_coil(src.loc, 5)
else if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass")
else if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_GLASS)
if(state == FRAME_WIRED)
if(frame_type.frame_class == FRAME_CLASS_COMPUTER)
var/obj/item/stack/G = P
code/game/machinery/partslathe_vr.dm
+2 -2
View File
@@ -62,7 +62,7 @@
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
mb_rating += M.rating
storage_capacity[MAT_STEEL] = mb_rating * 16000
storage_capacity["glass"] = mb_rating * 8000
storage_capacity[MAT_GLASS] = mb_rating * 8000
var/T = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
T += M.rating
@@ -212,7 +212,7 @@
switch(material)
if(MAT_STEEL)
mattype = /obj/item/stack/material/steel
if("glass")
if(MAT_GLASS)
mattype = /obj/item/stack/material/glass
else
return
code/game/mecha/mecha_parts.dm
+2 -2
View File
@@ -211,14 +211,14 @@
name="Phazon Torso"
icon_state = "phazon_harness"
//construction_time = 300
//construction_cost = list(MAT_STEEL=35000,"glass"=10000,MAT_PHORON=20000)
//construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,MAT_PHORON=20000)
origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
/obj/item/mecha_parts/part/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
//construction_time = 200
//construction_cost = list(MAT_STEEL=15000,"glass"=5000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,MAT_PHORON=10000)
origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
/obj/item/mecha_parts/part/phazon_left_arm
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/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/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/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
+1 -1
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
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/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/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/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/simple_doors.dm
+2 -2
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)
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/turfs/simulated/wall_types.dm
+4 -4
View File
@@ -1,7 +1,7 @@
/turf/simulated/wall/r_wall
icon_state = "rgeneric"
/turf/simulated/wall/r_wall/Initialize(mapload)
. = ..(mapload, "plasteel","plasteel") //3strong
. = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) //3strong
/turf/simulated/wall/shull
icon_state = "hull-steel"
@@ -39,7 +39,7 @@
/turf/simulated/wall/cult
icon_state = "cult"
/turf/simulated/wall/cult/Initialize(mapload)
. = ..(mapload, "cult","cult2","cult")
. = ..(mapload, MAT_CULT,MAT_CULT2,MAT_CULT)
/turf/unsimulated/wall/cult
name = "cult wall"
desc = "Hideous images dance beneath the surface."
@@ -381,7 +381,7 @@
/turf/simulated/wall/eris/r_wall
icon_state = "rgeneric"
/turf/simulated/wall/eris/r_wall/Initialize(mapload)
. = ..(mapload, "plasteel","plasteel")
. = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL)
// Bay walls
/turf/simulated/wall/bay
@@ -429,7 +429,7 @@
/turf/simulated/wall/bay/r_wall
icon_state = "rgeneric"
/turf/simulated/wall/bay/r_wall/Initialize(mapload)
. = ..(mapload, "plasteel","plasteel")
. = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL)
/turf/simulated/wall/tgmc
icon = 'icons/turf/wall_masks_tgmc.dmi'
code/game/turfs/simulated/wall_types_vr.dm
+2 -2
View File
@@ -229,11 +229,11 @@ var/list/flesh_overlay_cache = list()
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/stonebricks/Initialize(mapload)
. = ..(mapload, "concrete")
. = ..(mapload, MAT_CONCRETE)
/turf/simulated/wall/stonelogs
icon_state = "stonelogs"
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/stonelogs/Initialize(mapload)
. = ..(mapload, "concrete",MAT_LOG)
. = ..(mapload, MAT_CONCRETE,MAT_LOG)
code/modules/fishing/fishing_net.dm
+2 -2
View File
@@ -18,7 +18,7 @@
reach = 2
default_material = "cloth"
default_material = MAT_CLOTH
var/list/accepted_mobs = list(/mob/living/simple_mob/animal/passive/fish)
@@ -125,7 +125,7 @@
reach = 1
default_material = "cloth"
default_material = MAT_CLOTH
accepted_mobs = list(/mob/living/simple_mob/animal/sif/glitterfly, /mob/living/carbon/human)
code/modules/fishing/fishing_rod_vr.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/material/fishing_rod/modern/strong
desc = "A extremely refined rod for catching fish."
default_material = "durasteel"
default_material = MAT_DURASTEEL
toolspeed = 0.5
toolspeed = 0.5
code/modules/materials/material_synth.dm
+7 -7
View File
@@ -17,25 +17,25 @@
/obj/item/stack/material/cyborg/plastic
icon_state = "sheet-plastic"
default_type = "plastic"
default_type = MAT_PLASTIC
/obj/item/stack/material/cyborg/steel
icon_state = "sheet-metal"
default_type = "steel"
default_type = MAT_STEEL
/obj/item/stack/material/cyborg/plasteel
icon_state = "sheet-plasteel"
default_type = "plasteel"
default_type = MAT_PLASTEEL
/obj/item/stack/material/cyborg/wood
icon_state = "sheet-wood"
default_type = "wood"
default_type = MAT_WOOD
/obj/item/stack/material/cyborg/glass
icon_state = "sheet-glass"
default_type = "glass"
default_type = MAT_GLASS
/obj/item/stack/material/cyborg/glass/reinforced
icon_state = "sheet-rglass"
default_type = "rglass"
charge_costs = list(500, 1000)
default_type = MAT_RGLASS
charge_costs = list(500, 1000)
code/modules/materials/materials/alien_alloy.dm
+2 -2
View File
@@ -1,6 +1,6 @@
// Adminspawn only, do not let anyone get this.
/datum/material/alienalloy
name = "alienalloy"
name = MAT_ALIENALLOY
display_name = "durable alloy"
stack_type = null
flags = MATERIAL_UNMELTABLE
@@ -37,4 +37,4 @@
display_name = "alien"
icon_base = "alien"
table_icon_base = "alien"
icon_colour = "#FFFFFF"
icon_colour = "#FFFFFF"
code/modules/materials/materials/cult.dm
+4 -4
View File
@@ -1,5 +1,5 @@
/datum/material/cult
name = "cult"
name = MAT_CULT
display_name = "disturbing stone"
icon_base = "cult"
table_icon_base = "stone"
@@ -11,14 +11,14 @@
conductive = 0
/datum/material/cult/place_dismantled_girder(var/turf/target)
new /obj/structure/girder/cult(target, "cult")
new /obj/structure/girder/cult(target, MAT_CULT)
/datum/material/cult/place_dismantled_product(var/turf/target)
new /obj/effect/decal/cleanable/blood(target)
/datum/material/cult/reinf
name = "cult2"
name = MAT_CULT2
display_name = "human remains"
/datum/material/cult/reinf/place_dismantled_product(var/turf/target)
new /obj/effect/decal/remains/human(target)
new /obj/effect/decal/remains/human(target)
code/modules/materials/materials/gems.dm
+4 -4
View File
@@ -63,8 +63,8 @@
/datum/material/painite
name = MAT_PAINITE
display_name = "painite"
use_name = "painite"
display_name = MAT_PAINITE
use_name = MAT_PAINITE
icon_colour = "#6b4947"
stack_type = /obj/item/stack/material/painite
flags = MATERIAL_UNMELTABLE
@@ -78,8 +78,8 @@
/datum/material/void_opal
name = MAT_VOPAL
display_name = "void opal"
use_name = "void opal"
display_name = MAT_VOPAL
use_name = MAT_VOPAL
icon_colour = "#0f0f0f"
stack_type = /obj/item/stack/material/void_opal
flags = MATERIAL_UNMELTABLE
code/modules/materials/materials/glass.dm
+2 -2
View File
@@ -115,7 +115,7 @@
/datum/material/glass/phoron
name = MAT_PGLASS
display_name = "borosilicate glass"
display_name = MAT_PGLASS
stack_type = /obj/item/stack/material/glass/phoronglass
flags = MATERIAL_BRITTLE
integrity = 100
@@ -129,7 +129,7 @@
/datum/material/glass/phoron/reinforced
name = MAT_RPGLASS
display_name = "reinforced borosilicate glass"
display_name = MAT_RPGLASS
stack_type = /obj/item/stack/material/glass/phoronrglass
stack_origin_tech = list(TECH_MATERIAL = 5)
window_options = list("One Direction" = 1, "Full Window" = 4)
code/modules/materials/materials/holographic.dm
+5 -5
View File
@@ -5,13 +5,13 @@
shard_type = SHARD_NONE
/datum/material/plastic/holographic
name = "holoplastic"
display_name = "plastic"
name = "holo" + MAT_PLASTIC
display_name = MAT_PLASTIC
stack_type = null
shard_type = SHARD_NONE
/datum/material/wood/holographic
name = "holowood"
display_name = "wood"
name = "holo" + MAT_WOOD
display_name = MAT_WOOD
stack_type = null
shard_type = SHARD_NONE
shard_type = SHARD_NONE
code/modules/materials/materials/organic/cloth.dm
+25 -25
View File
@@ -1,5 +1,5 @@
/datum/material/cloth
name = "cloth"
name = MAT_CLOTH
stack_origin_tech = list(TECH_MATERIAL = 2)
door_icon_base = "wood"
ignition_point = T0C+232
@@ -46,7 +46,7 @@
)
/datum/material/cloth/syncloth
name = "syncloth"
name = MAT_SYNCLOTH
stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 2)
ignition_point = T0C+532
melting_point = T0C+600
@@ -57,63 +57,63 @@
hardness = 5
/datum/material/cloth/teal
name = "teal"
display_name ="teal"
name = MAT_CLOTH_TEAL
display_name =MAT_CLOTH_TEAL
use_name = "teal cloth"
icon_colour = "#00EAFA"
/datum/material/cloth/black
name = "black"
display_name = "black"
name = MAT_CLOTH_BLACK
display_name = MAT_CLOTH_BLACK
use_name = "black cloth"
icon_colour = "#505050"
/datum/material/cloth/green
name = "green"
display_name = "green"
name = MAT_CLOTH_GREEN
display_name = MAT_CLOTH_GREEN
use_name = "green cloth"
icon_colour = "#01C608"
/datum/material/cloth/puple
name = "purple"
display_name = "purple"
name = MAT_CLOTH_PURPLE
display_name = MAT_CLOTH_PURPLE
use_name = "purple cloth"
icon_colour = "#9C56C4"
/datum/material/cloth/blue
name = "blue"
display_name = "blue"
name = MAT_CLOTH_BLUE
display_name = MAT_CLOTH_BLUE
use_name = "blue cloth"
icon_colour = "#6B6FE3"
/datum/material/cloth/beige
name = "beige"
display_name = "beige"
name = MAT_CLOTH_BEIGE
display_name = MAT_CLOTH_BEIGE
use_name = "beige cloth"
icon_colour = "#E8E7C8"
/datum/material/cloth/lime
name = "lime"
display_name = "lime"
name = MAT_CLOTH_LIME
display_name = MAT_CLOTH_LIME
use_name = "lime cloth"
icon_colour = "#62E36C"
/datum/material/cloth/yellow
name = "yellow"
display_name = "yellow"
name = MAT_CLOTH_YELLOW
display_name = MAT_CLOTH_YELLOW
use_name = "yellow cloth"
icon_colour = "#EEF573"
/datum/material/cloth/orange
name = "orange"
display_name = "orange"
name = MAT_CLOTH_ORANGE
display_name = MAT_CLOTH_ORANGE
use_name = "orange cloth"
icon_colour = "#E3BF49"
/datum/material/carpet
name = "carpet"
name = MAT_CARPET
display_name = "comfy"
use_name = "red upholstery"
icon_colour = "#DA020A"
@@ -128,8 +128,8 @@
integrity = 40
/datum/material/cotton
name = "cotton"
display_name ="cotton"
name = MAT_COTTON
display_name =MAT_COTTON
icon_colour = "#FFFFFF"
flags = MATERIAL_PADDING|MATERIAL_BRITTLE
ignition_point = T0C+232
@@ -143,7 +143,7 @@
name = MAT_FIBERS
display_name = "plant"
sheet_singular_name = "fiber"
sheet_singular_name = "fibers"
sheet_singular_name = MAT_FIBERS
icon_colour = "#006b0e"
flags = MATERIAL_PADDING|MATERIAL_BRITTLE
ignition_point = T0C+232
@@ -152,4 +152,4 @@
conductive = 0
pass_stack_colors = TRUE
hardness = 5
integrity = 5
integrity = 5
code/modules/materials/materials/organic/resin.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/datum/material/resin
name = "resin"
name = MAT_RESIN
icon_colour = "#35343a"
icon_base = "resin"
table_icon_base = "stone"
@@ -53,4 +53,4 @@
new /datum/stack_recipe("[display_name] net", /obj/item/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE),
new /datum/stack_recipe("[display_name] membrane", /obj/structure/alien/membrane, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("[display_name] node", /obj/effect/alien/weeds/node, 1, time = 4 SECONDS, recycle_material = "[name]")
)
)
code/modules/materials/materials/organic/wood.dm
+5 -5
View File
@@ -94,10 +94,10 @@
/datum/material/wood/log
name = MAT_LOG
display_name = "wood" // will lead to "wood log"
display_name = MAT_WOOD // will lead to "wood log"
icon_base = "log"
stack_type = /obj/item/stack/material/log
sheet_singular_name = "log"
sheet_singular_name = MAT_LOG
sheet_plural_name = "logs"
sheet_collective_name = "pile"
pass_stack_colors = TRUE
@@ -110,7 +110,7 @@
/datum/material/wood/log/sif
name = MAT_SIFLOG
display_name = "alien wood"
display_name = MAT_SIFWOOD
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
stack_type = /obj/item/stack/material/log/sif
@@ -124,7 +124,7 @@
/datum/material/wood/stick
name = "wooden stick"
icon_colour = "#824B28"
display_name = "wood"
display_name = MAT_WOOD
icon_base = "stick"
stack_type = /obj/item/stack/material/stick
sheet_collective_name = "pile"
@@ -135,4 +135,4 @@
/datum/material/wood/stick/generate_recipes()
return
//VOREStation Addition End
//VOREStation Addition End
code/modules/materials/materials/plastic.dm
+1 -1
View File
@@ -57,7 +57,7 @@
)
/datum/material/cardboard
name = "cardboard"
name = MAT_CARDBOARD
stack_type = /obj/item/stack/material/cardboard
flags = MATERIAL_BRITTLE
integrity = 10
code/modules/materials/materials/snow.dm
+2 -2
View File
@@ -26,7 +26,7 @@
)
/datum/material/snowbrick //only slightly stronger than snow, used to make igloos mostly
name = "packed snow"
name = MAT_SNOWBRICK
flags = MATERIAL_BRITTLE
stack_type = /obj/item/stack/material/snowbrick
icon_base = "stone"
@@ -54,4 +54,4 @@
new /datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"),
new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"),
new /datum/stack_recipe("[display_name] ashtray", /obj/item/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
)
)
code/modules/materials/materials/stone.dm
+3 -3
View File
@@ -1,5 +1,5 @@
/datum/material/stone
name = "sandstone"
name = MAT_SANDSTONE
stack_type = /obj/item/stack/material/sandstone
icon_base = "stone"
table_icon_base = "stone"
@@ -20,7 +20,7 @@
recipes += new /datum/stack_recipe("planting bed", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1, recycle_material = "[name]")
/datum/material/stone/marble
name = "marble"
name = MAT_MARBLE
icon_colour = "#AAAAAA"
weight = 26
hardness = 30 //VOREStation Edit - Please.
@@ -36,7 +36,7 @@
)
//VOREStation Addition Start
/datum/material/stone/flint
name = "flint"
name = MAT_FLINT
icon_colour = "#9e9c99"
weight = 20
hardness = 30
code/modules/materials/sheets/gems.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/stack/material/void_opal
name = MAT_VOPAL
icon_state = "sheet-void_opal"
singular_name = "void opal"
singular_name = MAT_VOPAL
default_type = MAT_VOPAL
apply_colour = 1
no_variants = FALSE
code/modules/materials/sheets/glass.dm
+6 -6
View File
@@ -10,24 +10,24 @@
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rtransparent"
default_type = "rglass"
default_type = MAT_RGLASS
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronglass
name = "borosilicate glass"
name = MAT_PGLASS
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
singular_name = "borosilicate glass sheet"
icon_state = "sheet-transparent"
default_type = "borosilicate glass"
default_type = MAT_PGLASS
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/glass/phoronrglass
name = "reinforced borosilicate glass"
name = MAT_RPGLASS
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
singular_name = "reinforced borosilicate glass sheet"
icon_state = "sheet-rtransparent"
default_type = "reinforced borosilicate glass"
default_type = MAT_RPGLASS
no_variants = FALSE
apply_colour = TRUE
apply_colour = TRUE
code/modules/materials/sheets/organic/resin.dm
+3 -3
View File
@@ -1,8 +1,8 @@
/obj/item/stack/material/resin
name = "resin"
name = MAT_RESIN
icon_state = "sheet-resin"
default_type = "resin"
default_type = MAT_RESIN
no_variants = TRUE
apply_colour = TRUE
pass_color = TRUE
strict_color_stacking = TRUE
strict_color_stacking = TRUE
code/modules/materials/sheets/organic/textiles.dm
+3 -3
View File
@@ -1,5 +1,5 @@
/obj/item/stack/material/leather
name = "leather"
name = MAT_LEATHER
desc = "The by-product of mob grinding."
icon_state = "sheet-leather"
default_type = MAT_LEATHER
@@ -10,10 +10,10 @@
pickup_sound = 'sound/items/pickup/leather.ogg'
/obj/item/stack/material/cloth
name = "cloth"
name = MAT_CLOTH
desc = "Individual fibers woven into a cloth."
icon_state = "sheet-cloth"
default_type = "cloth"
default_type = MAT_CLOTH
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
code/modules/materials/sheets/organic/wood.dm
+3 -3
View File
@@ -20,7 +20,7 @@
description_info = "Rich, lustrous hardwood, imported from offworld at moderate expense. Mostly used for luxurious furniture, and not very good for weapons or other structures."
/obj/item/stack/material/log
name = "log"
name = MAT_LOG
icon_state = "sheet-log"
default_type = MAT_LOG
no_variants = FALSE
@@ -33,13 +33,13 @@
pickup_sound = 'sound/items/pickup/wooden.ogg'
/obj/item/stack/material/log/sif
name = "alien log"
name = MAT_SIFLOG
default_type = MAT_SIFLOG
color = "#0099cc"
plank_type = /obj/item/stack/material/wood/sif
/obj/item/stack/material/log/hard
name = "hardwood log"
name = MAT_HARDLOG
default_type = MAT_HARDLOG
color = "#6f432a"
plank_type = /obj/item/stack/material/wood/hard
code/modules/materials/sheets/plastic.dm
+2 -2
View File
@@ -5,9 +5,9 @@
no_variants = FALSE
/obj/item/stack/material/cardboard
name = "cardboard"
name = MAT_CARDBOARD
icon_state = "sheet-card"
default_type = "cardboard"
default_type = MAT_CARDBOARD
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
code/modules/materials/sheets/snow.dm
+4 -4
View File
@@ -1,16 +1,16 @@
// Ok, technically not stones, but the snowbrick's function is similar to sandstone and marble
/obj/item/stack/material/snow
name = "snow"
name = MAT_SNOW
desc = "The temptation to build a snowman rises."
icon_state = "sheet-snow"
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
default_type = "snow"
default_type = MAT_SNOW
/obj/item/stack/material/snowbrick
name = "snow brick"
desc = "For all of your igloo building needs."
icon_state = "sheet-snowbrick"
default_type = "packed snow"
default_type = MAT_SNOWBRICK
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
code/modules/materials/sheets/stone.dm
+8 -8
View File
@@ -1,23 +1,23 @@
/obj/item/stack/material/sandstone
name = "sandstone brick"
name = MAT_SANDSTONE + " brick"
icon_state = "sheet-sandstone"
default_type = "sandstone"
default_type = MAT_SANDSTONE
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/marble
name = "marble brick"
name = MAT_MARBLE + " brick"
icon_state = "sheet-marble"
default_type = "marble"
default_type = MAT_MARBLE
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/obj/item/stack/material/flint
name = "flint piece"
name = MAT_FLINT + " piece"
icon_state = "sheet-rock"
default_type = "flint"
default_type = MAT_FLINT
no_variants = FALSE
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
@@ -25,8 +25,8 @@
apply_colour = TRUE
/obj/item/stack/material/concrete
name = "concrete brick"
name = MAT_CONCRETE + " brick"
icon_state = "brick"
default_type = "concrete"
default_type = MAT_CONCRETE
no_variants = FALSE
apply_colour = 1
code/modules/mining/ore_datum.dm
+1 -1
View File
@@ -65,7 +65,7 @@
display_name = ORE_SAND
smelts_to = MAT_GLASS
alloy = 1
compresses_to = "sandstone"
compresses_to = MAT_SANDSTONE
/ore/phoron
name = ORE_PHORON
code/modules/mining/ore_datum_vr.dm
+4 -4
View File
@@ -1,9 +1,9 @@
/ore/rutile
name = "rutile"
display_name = "rutile"
smelts_to = "titanium"
name = ORE_RUTILE
display_name = ORE_RUTILE
smelts_to = MAT_TITANIUM
alloy = 1
result_amount = 5
spread_chance = 10
ore = /obj/item/ore/rutile
scan_icon = "mineral_rare"
scan_icon = "mineral_rare"
code/modules/power/solar.dm
+1 -1
View File
@@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(solars_list)
playsound(src, W.usesound, 75, 1)
return 1
if(istype(W, /obj/item/stack/material) && (W.get_material_name() == "glass" || W.get_material_name() == "rglass"))
if(istype(W, /obj/item/stack/material) && (W.get_material_name() == MAT_GLASS || W.get_material_name() == MAT_RGLASS))
var/obj/item/stack/material/S = W
if(S.use(2))
playsound(src, 'sound/machines/click.ogg', 50, 1)
code/modules/reagents/reactions/instant/instant.dm
+2 -2
View File
@@ -611,14 +611,14 @@
/decl/chemical_reaction/instant/solidification/steel
name = "Solid Steel"
id = "solidsteel"
required_reagents = list(REAGENT_ID_FROSTOIL = 5, "steel" = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_STEEL = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/steel
/decl/chemical_reaction/instant/solidification/plasteel
name = "Solid Plasteel"
id = "solidplasteel"
required_reagents = list(REAGENT_ID_FROSTOIL = 10, "plasteel" = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_FROSTOIL = 10, REAGENT_ID_PLASTEEL = REAGENTS_PER_SHEET)
sheet_to_give = /obj/item/stack/material/plasteel
code/modules/resleeving/computers.dm
+1 -1
View File
@@ -289,7 +289,7 @@
set_temp("Error: Not enough [MAT_STEEL] in SynthFab.", "danger")
active_br = null
return
else if(spod.stored_material["glass"] < spod.body_cost)
else if(spod.stored_material[MAT_GLASS] < spod.body_cost)
set_temp("Error: Not enough glass in SynthFab.", "danger")
active_br = null
return
code/modules/resleeving/machines.dm
+2 -2
View File
@@ -271,7 +271,7 @@
if(!istype(BR) || busy)
return 0
if(stored_material[MAT_STEEL] < body_cost || stored_material["glass"] < body_cost)
if(stored_material[MAT_STEEL] < body_cost || stored_material[MAT_GLASS] < body_cost)
return 0
current_project = BR
@@ -373,7 +373,7 @@
//Machine specific stuff at the end
stored_material[MAT_STEEL] -= body_cost
stored_material["glass"] -= body_cost
stored_material[MAT_GLASS] -= body_cost
busy = 0
update_icon()
code/modules/tables/presets.dm
+14 -14
View File
@@ -20,7 +20,7 @@
color = "#CCCCCC"
/obj/structure/table/marble/New()
material = get_material_by_name("marble")
material = get_material_by_name(MAT_MARBLE)
..()
/obj/structure/table/reinforced
@@ -46,7 +46,7 @@
color = "#824B28"
/obj/structure/table/wooden_reinforced/New()
material = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
reinforced = get_material_by_name(MAT_STEEL)
..()
@@ -55,7 +55,7 @@
color = "#824B28"
/obj/structure/table/woodentable/New()
material = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
..()
/obj/structure/table/sifwoodentable
@@ -63,7 +63,7 @@
color = "#824B28"
/obj/structure/table/sifwoodentable/New()
material = get_material_by_name("alien wood")
material = get_material_by_name(MAT_SIFWOOD)
..()
/obj/structure/table/sifwooden_reinforced
@@ -71,7 +71,7 @@
color = "#824B28"
/obj/structure/table/sifwooden_reinforced/New()
material = get_material_by_name("alien wood")
material = get_material_by_name(MAT_SIFWOOD)
reinforced = get_material_by_name(MAT_STEEL)
..()
@@ -80,14 +80,14 @@
color = "#42291a"
/obj/structure/table/hardwoodtable/Initialize(mapload)
material = get_material_by_name("hardwood")
material = get_material_by_name(MAT_HARDWOOD)
return ..()
/obj/structure/table/gamblingtable
icon_state = "gamble_preview"
/obj/structure/table/gamblingtable/New()
material = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
carpeted = 1
..()
@@ -97,7 +97,7 @@
alpha = 77 // 0.3 * 255
/obj/structure/table/glass/New()
material = get_material_by_name("glass")
material = get_material_by_name(MAT_GLASS)
..()
/obj/structure/table/borosilicate
@@ -106,7 +106,7 @@
alpha = 77
/obj/structure/table/borosilicate/New()
material = get_material_by_name("borosilicate glass")
material = get_material_by_name(MAT_PGLASS)
..()
/obj/structure/table/holotable
@@ -164,7 +164,7 @@
color = "#CCCCCC"
/obj/structure/table/bench/marble/New()
material = get_material_by_name("marble")
material = get_material_by_name(MAT_MARBLE)
..()
/*
/obj/structure/table/bench/reinforced
@@ -190,7 +190,7 @@
color = "#824B28"
/obj/structure/table/bench/wooden_reinforced/New()
material = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
reinforced = get_material_by_name(MAT_STEEL)
..()
*/
@@ -199,7 +199,7 @@
color = "#824B28"
/obj/structure/table/bench/wooden/New()
material = get_material_by_name("wood")
material = get_material_by_name(MAT_WOOD)
..()
/obj/structure/table/bench/sifwooden
@@ -207,7 +207,7 @@
color = "#824B28"
/obj/structure/table/bench/sifwooden/New()
material = get_material_by_name("alien wood")
material = get_material_by_name(MAT_SIFWOOD)
..()
/obj/structure/table/bench/sifwooden/padded
@@ -228,7 +228,7 @@
alpha = 77 // 0.3 * 255
/obj/structure/table/bench/glass/New()
material = get_material_by_name("glass")
material = get_material_by_name(MAT_GLASS)
..()
/*
code/modules/vehicles/boat.dm
+2 -2
View File
@@ -51,7 +51,7 @@
/obj/item/oar/New(newloc, material_name)
..(newloc)
if(!material_name)
material_name = "wood"
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
qdel(src)
@@ -61,7 +61,7 @@
/obj/vehicle/boat/New(newloc, 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/modules/vore/eating/living_vr.dm
+1 -1
View File
@@ -1086,7 +1086,7 @@
MAT_PLASTITANIUMGLASS = list("nutrition" = 25, "remark" = "After some work, you grind [O] down with a satisfying crunch to unleash a sublime mixture of mildly sour richness and cooling refreshment. It readily entices you for another bite.", "WTF" = FALSE),
MAT_GLASS = list("nutrition" = 0, "remark" = "All crunch and nothing more, you effortlessly grind [O] down to find it only wets your appetite and dries the throat.", "WTF" = FALSE),
MAT_RGLASS = list("nutrition" = 5, "remark" = "With a satisfying crunch, you grind [O] down with ease. It is barely palatable with a subtle metallic tang.", "WTF" = FALSE),
MAT_BOROSILICATE = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_PGLASS = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_RPGLASS = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE),
MAT_GRAPHITE = list("nutrition" = 30, "remark" = "Satisfyingly metallic with a mildly savoury tartness, you chew [O] until its flavour is no more but are left longing for another.", "WTF" = FALSE),
MAT_OSMIUM = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectable.", "WTF" = FALSE),
code/modules/vore/fluffstuff/custom_items_vr.dm
+1 -1
View File
@@ -1381,7 +1381,7 @@
desc = "A mostly decorative knife made from thin ceramic and toothed with large black fangs. Printed on the flat is an eight-armed cross, like an asterisk with an extra stroke, ringed by a calligraphy-style crescent."
attack_verb = list("mauled", "bit", "sawed", "butchered")
dulled = 1
default_material = "glass"
default_material = MAT_GLASS
//Ashling - Antoinette deKaultieste
code/modules/xenobio/items/extracts.dm
+31 -31
View File
@@ -116,8 +116,8 @@
// 'Duplicates' liquid metals, consuming itself in the process.
/datum/reagent/toxin/metamorphic_metal
name = "Metamorphic Metal"
id = "metamorphic"
name = REAGENT_METAMORPHIC
id = REAGENT_ID_METAMORPHIC
description = "A strange metallic liquid which can rearrange itself to take the form of other metals it touches."
taste_description = "metallic"
taste_mult = 1.1
@@ -129,7 +129,7 @@
name = "Slime Metal"
id = "m_metal"
required_reagents = list(REAGENT_ID_PHORON = 5)
result = "metamorphic"
result = REAGENT_ID_METAMORPHIC
result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal.
required = /obj/item/slime_extract/metal
@@ -143,49 +143,49 @@
desc = "A small bottle. Contains some really weird liquid metal."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("metamorphic" = 60)
prefill = list(REAGENT_ID_METAMORPHIC = 60)
// This is kind of a waste since iron is in the chem dispenser but it would be inconsistent if this wasn't here.
/decl/chemical_reaction/instant/metamorphic/iron
name = "Morph into Iron"
id = "morph_iron"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET)
result = REAGENT_ID_IRON
/decl/chemical_reaction/instant/metamorphic/silver
name = "Morph into Silver"
id = "morph_silver"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_SILVER = REAGENTS_PER_SHEET)
result = REAGENT_ID_SILVER
/decl/chemical_reaction/instant/metamorphic/gold
name = "Morph into Gold"
id = "morph_gold"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_GOLD = REAGENTS_PER_SHEET)
result = REAGENT_ID_GOLD
/decl/chemical_reaction/instant/metamorphic/platinum
name = "Morph into Platinum"
id = "morph_platinum"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_PLATINUM
/decl/chemical_reaction/instant/metamorphic/uranium
name = "Morph into Uranium"
id = "morph_uranium"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_URANIUM
/decl/chemical_reaction/instant/metamorphic/phoron
name = "Morph into Phoron"
id = "morph_phoron"
required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
required_reagents = list(REAGENT_ID_METAMORPHIC = REAGENTS_PER_SHEET, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
result = REAGENT_ID_PHORON
@@ -194,14 +194,14 @@
name = "Slime Binding"
id = "m_binding"
required_reagents = list(REAGENT_ID_WATER = 5)
result = "binding"
result = REAGENT_ID_BINDING
result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal.
required = /obj/item/slime_extract/metal
/datum/reagent/toxin/binding_metal
name = "Binding Metal"
id = "binding"
name = REAGENT_BINDING
id = REAGENT_ID_BINDING
description = "A strange metallic liquid which can bind other metals together that would otherwise require intense heat to alloy."
taste_description = "metallic"
taste_mult = 1.1
@@ -214,19 +214,19 @@
desc = "A small bottle. Contains some really weird liquid metal."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
prefill = list("binding" = 60)
prefill = list(REAGENT_ID_BINDING = 60)
/decl/chemical_reaction/instant/binding
name = "Bind into Steel"
id = "bind_steel"
result = "steel"
required_reagents = list("binding" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET)
result = REAGENT_ID_STEEL
required_reagents = list(REAGENT_ID_BINDING = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET)
result_amount = REAGENTS_PER_SHEET
/datum/reagent/steel
name = "Liquid Steel"
id = "steel"
name = REAGENT_STEEL
id = REAGENT_ID_STEEL
description = "An 'alloy' of iron and carbon, forced to bind together by another strange metallic liquid."
taste_description = "metallic"
reagent_state = LIQUID
@@ -236,12 +236,12 @@
/decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe.
name = "Bind into Plasteel"
id = "bind_plasteel"
required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = "plasteel"
required_reagents = list(REAGENT_ID_BINDING = REAGENTS_PER_SHEET, REAGENT_ID_STEEL = REAGENTS_PER_SHEET * 2, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET)
result = REAGENT_ID_PLASTEEL
/datum/reagent/plasteel
name = "Liquid Plasteel"
id = "plasteel"
name = REAGENT_PLASTEEL
id = REAGENT_ID_PLASTEEL
description = "An 'alloy' of iron, carbon, and platinum, forced to bind together by another strange metallic liquid."
taste_description = "metallic"
reagent_state = LIQUID
@@ -625,7 +625,7 @@
/decl/chemical_reaction/instant/slime/pink_clotting
name = "Slime Clotting Med"
id = "m_clotting"
result = "slime_bleed_fixer"
result = REAGENT_ID_SLIMEBLEEDFIXER
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -634,7 +634,7 @@
/decl/chemical_reaction/instant/slime/pink_bone_fix
name = "Slime Bone Med"
id = "m_bone_fixer"
result = "slime_bone_fixer"
result = REAGENT_ID_SLIMEBONEFIXER
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -643,29 +643,29 @@
/decl/chemical_reaction/instant/slime/pink_organ_fix
name = "Slime Organ Med"
id = "m_organ_fixer"
result = "slime_organ_fixer"
result = REAGENT_ID_SLIMEORGANFIXER
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
/datum/reagent/myelamine/slime
name = "Agent A"
id = "slime_bleed_fixer"
name = REAGENT_SLIMEBLEEDFIXER
id = REAGENT_ID_SLIMEBLEEDFIXER
description = "A slimy liquid which appears to rapidly clot internal hemorrhages by increasing the effectiveness of platelets at low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
/datum/reagent/osteodaxon/slime
name = "Agent B"
id = "slime_bone_fixer"
name = REAGENT_SLIMEBONEFIXER
id = REAGENT_ID_SLIMEBONEFIXER
description = "A slimy liquid which can be used to heal bone fractures at low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
/datum/reagent/peridaxon/slime
name = "Agent C"
id = "slime_organ_fixer"
name = REAGENT_SLIMEORGANFIXER
id = REAGENT_ID_SLIMEORGANFIXER
description = "A slimy liquid which is used to encourage recovery of internal organs and nervous systems in low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
code/modules/xenobio/items/extracts_vr.dm
+3 -3
View File
@@ -974,7 +974,7 @@
/decl/chemical_reaction/instant/slime/pink_bone_fix
name = "Slime Bone Med"
id = "m_pink_bone_fixer"
result = "slime_bone_fixer"
result = REAGENT_ID_SLIMEBONEFIXER
required_reagents = list(REAGENT_ID_PHORON = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -983,7 +983,7 @@
/decl/chemical_reaction/instant/slime/pink_clotting
name = "Slime Clotting Med"
id = "m_pink_clotting"
result = "slime_bleed_fixer"
result = REAGENT_ID_SLIMEBLEEDFIXER
required_reagents = list(REAGENT_ID_BLOOD = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
@@ -992,7 +992,7 @@
/decl/chemical_reaction/instant/slime/pink_organ_fix
name = "Slime Organ Med"
id = "m_pink_organ_fixer"
result = "slime_organ_fixer"
result = REAGENT_ID_SLIMEORGANFIXER
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/pink
code/modules/xenobio/items/slime_objects.dm
+3 -3
View File
@@ -190,21 +190,21 @@
/datum/reagent/myelamine/slime
name = "Agent A"
id = "slime_bleed_fixer"
id = REAGENT_ID_SLIMEBLEEDFIXER
description = "A slimy liquid which appears to rapidly clot internal hemorrhages by increasing the effectiveness of platelets at low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
/datum/reagent/osteodaxon/slime
name = "Agent B"
id = "slime_bone_fixer"
id = REAGENT_ID_SLIMEBONEFIXER
description = "A slimy liquid which can be used to heal bone fractures at low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
/datum/reagent/peridaxon/slime
name = "Agent C"
id = "slime_organ_fixer"
id = REAGENT_ID_SLIMEORGANFIXER
description = "A slimy liquid which is used to encourage recovery of internal organs and nervous systems in low quantities. Toxic in high quantities."
taste_description = "slime"
overdose = 5
maps/redgate/fantasy_items.dm
+1 -1
View File
@@ -540,7 +540,7 @@ This device records all warnings given and teleport events for admin review in c
//locked door
/obj/structure/simple_door/dungeon/Initialize(mapload,var/material_name)
..(mapload, material_name || "cult")
..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/dungeon/locked
locked = TRUE