mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
This commit is contained in:
MagmaRam
@@ -9,34 +9,34 @@
|
||||
|
||||
/datum/supply_packs/materials/metal50
|
||||
name = "50 metal sheets"
|
||||
contains = list(/obj/item/stack/material/steel/fifty)
|
||||
contains = list(/obj/fiftyspawner/steel)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Metal sheets crate"
|
||||
|
||||
/datum/supply_packs/materials/glass50
|
||||
name = "50 glass sheets"
|
||||
contains = list(/obj/item/stack/material/glass/fifty)
|
||||
contains = list(/obj/fiftyspawner/glass)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Glass sheets crate"
|
||||
|
||||
/datum/supply_packs/materials/wood50
|
||||
name = "50 wooden planks"
|
||||
contains = list(/obj/item/stack/material/wood/fifty)
|
||||
contains = list(/obj/fiftyspawner/wood)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Wooden planks crate"
|
||||
|
||||
/datum/supply_packs/materials/plastic50
|
||||
name = "50 plastic sheets"
|
||||
contains = list(/obj/item/stack/material/plastic/fifty)
|
||||
contains = list(/obj/fiftyspawner/plastic)
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Plastic sheets crate"
|
||||
|
||||
/datum/supply_packs/materials/cardboard_sheets
|
||||
contains = list(/obj/item/stack/material/cardboard/fifty)
|
||||
contains = list(/obj/fiftyspawner/cardboard)
|
||||
name = "50 cardboard sheets"
|
||||
cost = 10
|
||||
containertype = /obj/structure/closet/crate
|
||||
@@ -48,8 +48,8 @@
|
||||
containername = "Imported carpet crate"
|
||||
cost = 15
|
||||
contains = list(
|
||||
/obj/item/stack/tile/carpet/fifty,
|
||||
/obj/item/stack/tile/carpet/blue/fifty
|
||||
/obj/fiftyspawner/carpet,
|
||||
/obj/fiftyspawner/bluecarpet
|
||||
)
|
||||
|
||||
|
||||
@@ -58,4 +58,4 @@
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Linoleum crate"
|
||||
cost = 15
|
||||
contains = list(/obj/item/stack/tile/linoleum/fifty)
|
||||
contains = list(/obj/fiftyspawner/linoleum)
|
||||
@@ -53,7 +53,7 @@
|
||||
/datum/supply_packs/supply/shipping
|
||||
name = "Shipping supplies"
|
||||
contains = list(
|
||||
/obj/item/stack/material/cardboard/fifty,
|
||||
/obj/fiftyspawner/cardboard,
|
||||
/obj/item/weapon/packageWrap = 4,
|
||||
/obj/item/weapon/wrapping_paper = 2,
|
||||
/obj/item/device/destTagger,
|
||||
|
||||
19
code/game/objects/items/stacks/fifty_spawner.dm
Normal file
19
code/game/objects/items/stacks/fifty_spawner.dm
Normal file
@@ -0,0 +1,19 @@
|
||||
//50-stacks as their own type was too buggy, we're doing it a different way
|
||||
/obj/fiftyspawner //this doesn't need to do anything but make the stack and die so it's light
|
||||
name = "50-stack spawner"
|
||||
desc = "This item spawns stack of 50 of a given material."
|
||||
icon = 'icons/misc/mark.dmi'
|
||||
icon_state = "x4"
|
||||
var/material = ""
|
||||
|
||||
/obj/fiftyspawner/New()
|
||||
//spawns the 50-stack and qdels self
|
||||
..()
|
||||
var/obj_path = text2path("/obj/item/stack/[material]")
|
||||
var/obj/item/stack/M = new obj_path(src.loc)
|
||||
M.amount = M.max_amount //some stuff spawns with 60, we're still calling it fifty
|
||||
qdel(src)
|
||||
|
||||
/obj/fiftyspawner/rods
|
||||
name = "stack of rods" //this needs to be defined for cargo
|
||||
material = "rods"
|
||||
@@ -13,9 +13,6 @@
|
||||
max_amount = 60
|
||||
attack_verb = list("hit", "bludgeoned", "whacked")
|
||||
|
||||
/obj/item/stack/rods/fifty //Calling this path still fifty because sixty is confusing
|
||||
amount = 60
|
||||
|
||||
/obj/item/stack/rods/cyborg
|
||||
name = "metal rod synthesizer"
|
||||
desc = "A device that makes metal rods."
|
||||
|
||||
49
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
Normal file
49
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
Normal file
@@ -0,0 +1,49 @@
|
||||
//see /code/modules/materials/fifty_stacks.dm for how this stuff works
|
||||
|
||||
/obj/fiftyspawner/grass
|
||||
name = "stack of grass"
|
||||
material = "tile/grass"
|
||||
|
||||
/obj/fiftyspawner/wood
|
||||
name = "stack of wood"
|
||||
material = "tile/wood"
|
||||
|
||||
/obj/fiftyspawner/carpet
|
||||
name = "stack of carpet"
|
||||
material = "tile/carpet"
|
||||
|
||||
/obj/fiftyspawner/bluecarpet
|
||||
name = "stack of blue carpet"
|
||||
material = "tile/carpet/blue"
|
||||
|
||||
/obj/fiftyspawner/floor
|
||||
name = "stack of floor tiles"
|
||||
material = "tile/floor"
|
||||
|
||||
/obj/fiftyspawner/floor_red
|
||||
name = "stack of red floor tiles"
|
||||
material = "tile/floor_red"
|
||||
|
||||
/obj/fiftyspawner/floor_steel
|
||||
name = "stack of steel floor tiles"
|
||||
material = "tile/floor_steel"
|
||||
|
||||
/obj/fiftyspawner/floor_white
|
||||
name = "stack of white floor tiles"
|
||||
material = "tile/floor_white"
|
||||
|
||||
/obj/fiftyspawner/floor_yellow
|
||||
name = "stack of yellow floor tiles"
|
||||
material = "tile/floor_yellow"
|
||||
|
||||
/obj/fiftyspawner/floor_dark
|
||||
name = "stack of dark floor tiles"
|
||||
material = "tile/floor_dark"
|
||||
|
||||
/obj/fiftyspawner/floor_freezer
|
||||
name = "stack of freezer tiles"
|
||||
material = "tile/floor_freezer"
|
||||
|
||||
/obj/fiftyspawner/linoleum
|
||||
name = "stack of linoleum tiles"
|
||||
material = "tile/linoleum"
|
||||
@@ -6,6 +6,8 @@
|
||||
* Carpet
|
||||
* Blue Carpet
|
||||
* Linoleum
|
||||
*
|
||||
* Put your stuff in fifty_stacks_tiles.dm as well.
|
||||
*/
|
||||
|
||||
/obj/item/stack/tile
|
||||
@@ -76,18 +78,12 @@
|
||||
throw_range = 20
|
||||
flags = 0
|
||||
|
||||
/obj/item/stack/tile/carpet/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/carpet/blue
|
||||
name = "blue carpet"
|
||||
singular_name = "blue carpet"
|
||||
desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
|
||||
icon_state = "tile-bluecarpet"
|
||||
|
||||
/obj/item/stack/tile/carpet/blue/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor
|
||||
name = "floor tile"
|
||||
singular_name = "floor tile"
|
||||
@@ -100,63 +96,42 @@
|
||||
throw_range = 20
|
||||
flags = CONDUCT
|
||||
|
||||
/obj/item/stack/tile/floor/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_red
|
||||
name = "red floor tile"
|
||||
singular_name = "red floor tile"
|
||||
color = COLOR_RED_GRAY
|
||||
icon_state = "tile_white"
|
||||
|
||||
/obj/item/stack/tile/floor_red/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_steel
|
||||
name = "steel floor tile"
|
||||
singular_name = "steel floor tile"
|
||||
icon_state = "tile_steel"
|
||||
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
|
||||
|
||||
/obj/item/stack/tile/floor_steel/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_white
|
||||
name = "white floor tile"
|
||||
singular_name = "white floor tile"
|
||||
icon_state = "tile_white"
|
||||
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
|
||||
|
||||
/obj/item/stack/tile/floor_white/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_yellow
|
||||
name = "yellow floor tile"
|
||||
singular_name = "yellow floor tile"
|
||||
color = COLOR_BROWN
|
||||
icon_state = "tile_white"
|
||||
|
||||
/obj/item/stack/tile/floor_yellow/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_dark
|
||||
name = "dark floor tile"
|
||||
singular_name = "dark floor tile"
|
||||
icon_state = "fr_tile"
|
||||
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
|
||||
|
||||
/obj/item/stack/tile/floor_dark/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor_freezer
|
||||
name = "freezer floor tile"
|
||||
singular_name = "freezer floor tile"
|
||||
icon_state = "tile_freezer"
|
||||
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
|
||||
|
||||
/obj/item/stack/tile/foor_freezer/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/tile/floor/cyborg
|
||||
name = "floor tile synthesizer"
|
||||
desc = "A device that makes floor tiles."
|
||||
@@ -177,6 +152,3 @@
|
||||
throw_speed = 5
|
||||
throw_range = 20
|
||||
flags = 0
|
||||
|
||||
/obj/item/stack/tile/linoleum/fifty
|
||||
amount = 50
|
||||
97
code/modules/materials/fifty_spawner_mats.dm
Normal file
97
code/modules/materials/fifty_spawner_mats.dm
Normal file
@@ -0,0 +1,97 @@
|
||||
//see /code/game/objects/items/stacks/fifty_spawner.dm for details on this
|
||||
|
||||
/obj/fiftyspawner/iron
|
||||
name = "stack of iron"
|
||||
material = "material/iron"
|
||||
|
||||
/obj/fiftyspawner/sandstone
|
||||
name = "stack of sandstone"
|
||||
material = "material/sandstone"
|
||||
|
||||
/obj/fiftyspawner/marble
|
||||
name = "stack of marble"
|
||||
material = "material/marble"
|
||||
|
||||
/obj/fiftyspawner/diamond
|
||||
name = "stack of diamond"
|
||||
material = "material/diamond"
|
||||
|
||||
/obj/fiftyspawner/uranium
|
||||
name = "stack of uranium"
|
||||
material = "material/uranium"
|
||||
|
||||
/obj/fiftyspawner/phoron
|
||||
name = "stack of phoron"
|
||||
material = "material/phoron"
|
||||
|
||||
/obj/fiftyspawner/plastic
|
||||
name = "stack of plastic"
|
||||
material = "material/plastic"
|
||||
|
||||
/obj/fiftyspawner/gold
|
||||
name = "stack of gold"
|
||||
material = "material/gold"
|
||||
|
||||
/obj/fiftyspawner/silver
|
||||
name = "stack of silver"
|
||||
material = "material/silver"
|
||||
|
||||
/obj/fiftyspawner/platinum
|
||||
name = "stack of platinum"
|
||||
material = "material/platinum"
|
||||
|
||||
/obj/fiftyspawner/mhydrogen
|
||||
name = "stack of mhydrogen"
|
||||
material = "material/mhydrogen"
|
||||
|
||||
/obj/fiftyspawner/tritium
|
||||
name = "stack of tritium"
|
||||
material = "material/tritium"
|
||||
|
||||
/obj/fiftyspawner/osmium
|
||||
name = "stack of osmium"
|
||||
material = "material/osmium"
|
||||
|
||||
/obj/fiftyspawner/steel
|
||||
name = "stack of steel"
|
||||
material = "material/steel"
|
||||
|
||||
/obj/fiftyspawner/plasteel
|
||||
name = "stack of plasteel"
|
||||
material = "material/plasteel"
|
||||
|
||||
/obj/fiftyspawner/durasteel
|
||||
name = "stack of durasteel"
|
||||
material = "material/durasteel"
|
||||
|
||||
/obj/fiftyspawner/wood
|
||||
name = "stack of wood"
|
||||
material = "material/wood"
|
||||
|
||||
/obj/fiftyspawner/cloth
|
||||
name = "stack of cloth"
|
||||
material = "material/cloth"
|
||||
|
||||
/obj/fiftyspawner/cardboard
|
||||
name = "stack of cardboard"
|
||||
material = "material/cardboard"
|
||||
|
||||
/obj/fiftyspawner/leather
|
||||
name = "stack of leather"
|
||||
material = "material/leather"
|
||||
|
||||
/obj/fiftyspawner/glass
|
||||
name = "stack of glass"
|
||||
material = "material/glass"
|
||||
|
||||
/obj/fiftyspawner/rglass
|
||||
name = "stack of reinforced glass"
|
||||
material = "material/glass/reinforced"
|
||||
|
||||
/obj/fiftyspawner/phoronglass
|
||||
name = "stack of borosilicate glass"
|
||||
material = "material/glass/phoronglass"
|
||||
|
||||
/obj/fiftyspawner/phoronrglass
|
||||
name = "stack of reinforced borosilicate glass"
|
||||
material = "material/glass/phoronrglass"
|
||||
@@ -1,4 +1,5 @@
|
||||
// Stacked resources. They use a material datum for a lot of inherited values.
|
||||
// If you're adding something here, make sure to add it to fifty_spawner_mats.dm as well
|
||||
/obj/item/stack/material
|
||||
force = 5.0
|
||||
throwforce = 5
|
||||
@@ -92,91 +93,58 @@
|
||||
default_type = "iron"
|
||||
apply_colour = 1
|
||||
|
||||
/obj/item/stack/material/iron/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/sandstone
|
||||
name = "sandstone brick"
|
||||
icon_state = "sheet-sandstone"
|
||||
default_type = "sandstone"
|
||||
|
||||
/obj/item/stack/material/sandstone/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/marble
|
||||
name = "marble brick"
|
||||
icon_state = "sheet-marble"
|
||||
default_type = "marble"
|
||||
|
||||
/obj/item/stack/material/marble/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/diamond
|
||||
name = "diamond"
|
||||
icon_state = "sheet-diamond"
|
||||
default_type = "diamond"
|
||||
|
||||
/obj/item/stack/material/diamond/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/uranium
|
||||
name = "uranium"
|
||||
icon_state = "sheet-uranium"
|
||||
default_type = "uranium"
|
||||
|
||||
/obj/item/stack/material/uranium/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/phoron
|
||||
name = "solid phoron"
|
||||
icon_state = "sheet-phoron"
|
||||
default_type = "phoron"
|
||||
|
||||
/obj/item/stack/material/phoron/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/plastic
|
||||
name = "plastic"
|
||||
icon_state = "sheet-plastic"
|
||||
default_type = "plastic"
|
||||
|
||||
/obj/item/stack/material/plastic/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/gold
|
||||
name = "gold"
|
||||
icon_state = "sheet-gold"
|
||||
default_type = "gold"
|
||||
|
||||
/obj/item/stack/material/gold/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/silver
|
||||
name = "silver"
|
||||
icon_state = "sheet-silver"
|
||||
default_type = "silver"
|
||||
|
||||
/obj/item/stack/material/silver/fifty
|
||||
amount = 50
|
||||
|
||||
//Valuable resource, cargo can sell it.
|
||||
/obj/item/stack/material/platinum
|
||||
name = "platinum"
|
||||
icon_state = "sheet-adamantine"
|
||||
default_type = "platinum"
|
||||
|
||||
/obj/item/stack/material/platinum/fifty
|
||||
amount = 50
|
||||
|
||||
//Extremely valuable to Research.
|
||||
/obj/item/stack/material/mhydrogen
|
||||
name = "metallic hydrogen"
|
||||
icon_state = "sheet-mythril"
|
||||
default_type = "mhydrogen"
|
||||
|
||||
/obj/item/stack/material/mhydrogen/fifty
|
||||
amount = 50
|
||||
|
||||
//Fuel for MRSPACMAN generator.
|
||||
/obj/item/stack/material/tritium
|
||||
name = "tritium"
|
||||
@@ -184,92 +152,59 @@
|
||||
default_type = "tritium"
|
||||
apply_colour = 1
|
||||
|
||||
/obj/item/stack/material/tritium/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/osmium
|
||||
name = "osmium"
|
||||
icon_state = "sheet-silver"
|
||||
default_type = "osmium"
|
||||
apply_colour = 1
|
||||
|
||||
/obj/item/stack/material/osmium/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/steel
|
||||
name = DEFAULT_WALL_MATERIAL
|
||||
icon_state = "sheet-metal"
|
||||
default_type = DEFAULT_WALL_MATERIAL
|
||||
|
||||
/obj/item/stack/material/steel/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/plasteel
|
||||
name = "plasteel"
|
||||
icon_state = "sheet-plasteel"
|
||||
default_type = "plasteel"
|
||||
|
||||
/obj/item/stack/material/plasteel/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/durasteel
|
||||
name = "durasteel"
|
||||
icon_state = "sheet-durasteel"
|
||||
item_state = "sheet-metal"
|
||||
default_type = "durasteel"
|
||||
|
||||
/obj/item/stack/material/durasteel/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/wood
|
||||
name = "wooden plank"
|
||||
icon_state = "sheet-wood"
|
||||
default_type = "wood"
|
||||
|
||||
/obj/item/stack/material/wood/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/cloth
|
||||
name = "cloth"
|
||||
icon_state = "sheet-cloth"
|
||||
default_type = "cloth"
|
||||
|
||||
/obj/item/stack/material/cloth/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/cardboard
|
||||
name = "cardboard"
|
||||
icon_state = "sheet-card"
|
||||
default_type = "cardboard"
|
||||
|
||||
/obj/item/stack/material/cardboard/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/leather
|
||||
name = "leather"
|
||||
desc = "The by-product of mob grinding."
|
||||
icon_state = "sheet-leather"
|
||||
default_type = "leather"
|
||||
|
||||
/obj/item/stack/material/leather/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/glass
|
||||
name = "glass"
|
||||
icon_state = "sheet-glass"
|
||||
default_type = "glass"
|
||||
|
||||
/obj/item/stack/material/glass/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/glass/reinforced
|
||||
name = "reinforced glass"
|
||||
icon_state = "sheet-rglass"
|
||||
default_type = "rglass"
|
||||
|
||||
/obj/item/stack/material/glass/reinforced/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/glass/phoronglass
|
||||
name = "borosilicate glass"
|
||||
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
|
||||
@@ -277,15 +212,9 @@
|
||||
icon_state = "sheet-phoronglass"
|
||||
default_type = "borosilicate glass"
|
||||
|
||||
/obj/item/stack/material/glass/phoronglass/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/material/glass/phoronrglass
|
||||
name = "reinforced borosilicate glass"
|
||||
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-phoronrglass"
|
||||
default_type = "reinforced borosilicate glass"
|
||||
|
||||
/obj/item/stack/material/glass/phoronrglass/fifty
|
||||
amount = 50
|
||||
|
||||
@@ -266,15 +266,15 @@ datum/supply_drop_loot/riot
|
||||
/datum/supply_drop_loot/materials/New()
|
||||
..()
|
||||
contents = list(
|
||||
/obj/item/stack/material/steel/fifty,
|
||||
/obj/item/stack/material/steel/fifty,
|
||||
/obj/item/stack/material/steel/fifty,
|
||||
/obj/item/stack/material/glass/fifty,
|
||||
/obj/item/stack/material/glass/fifty,
|
||||
/obj/item/stack/material/wood/fifty,
|
||||
/obj/item/stack/material/plastic/fifty,
|
||||
/obj/item/stack/material/glass/reinforced/fifty,
|
||||
/obj/item/stack/material/plasteel/fifty)
|
||||
/obj/fiftyspawner/steel,
|
||||
/obj/fiftyspawner/steel,
|
||||
/obj/fiftyspawner/steel,
|
||||
/obj/fiftyspawner/glass,
|
||||
/obj/fiftyspawner/glass,
|
||||
/obj/fiftyspawner/wood,
|
||||
/obj/fiftyspawner/plastic,
|
||||
/obj/fiftyspawner/rglass,
|
||||
/obj/fiftyspawner/plasteel)
|
||||
|
||||
/datum/supply_drop_loot/materials_advanced
|
||||
name = "Advanced Materials"
|
||||
@@ -282,20 +282,20 @@ datum/supply_drop_loot/riot
|
||||
/datum/supply_drop_loot/materials_advanced/New()
|
||||
..()
|
||||
contents = list(
|
||||
/obj/item/stack/material/steel/fifty,
|
||||
/obj/item/stack/material/glass/fifty,
|
||||
/obj/item/stack/material/wood/fifty,
|
||||
/obj/item/stack/material/plastic/fifty,
|
||||
/obj/item/stack/material/glass/reinforced/fifty,
|
||||
/obj/item/stack/material/plasteel/fifty,
|
||||
/obj/item/stack/material/diamond/fifty,
|
||||
/obj/item/stack/material/phoron/fifty,
|
||||
/obj/item/stack/material/gold/fifty,
|
||||
/obj/item/stack/material/silver/fifty,
|
||||
/obj/item/stack/material/platinum/fifty,
|
||||
/obj/item/stack/material/mhydrogen/fifty,
|
||||
/obj/item/stack/material/tritium/fifty,
|
||||
/obj/item/stack/material/osmium/fifty,)
|
||||
/obj/fiftyspawner/steel,
|
||||
/obj/fiftyspawner/glass,
|
||||
/obj/fiftyspawner/wood,
|
||||
/obj/fiftyspawner/plastic,
|
||||
/obj/fiftyspawner/rglass,
|
||||
/obj/fiftyspawner/plasteel,
|
||||
/obj/fiftyspawner/diamond,
|
||||
/obj/fiftyspawner/phoron,
|
||||
/obj/fiftyspawner/gold,
|
||||
/obj/fiftyspawner/silver,
|
||||
/obj/fiftyspawner/platinum,
|
||||
/obj/fiftyspawner/mhydrogen,
|
||||
/obj/fiftyspawner/tritium,
|
||||
/obj/fiftyspawner/osmium,)
|
||||
|
||||
/datum/supply_drop_loot/supermatter
|
||||
name = "Supermatter"
|
||||
|
||||
@@ -36,20 +36,19 @@
|
||||
|
||||
/obj/machinery/r_n_d/proc/getMaterialName(var/type)
|
||||
switch(type)
|
||||
//50-stacks weren't working despite being a subtype of the others, let's just force it in
|
||||
if(/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty)
|
||||
if(/obj/item/stack/material/steel)
|
||||
return DEFAULT_WALL_MATERIAL
|
||||
if(/obj/item/stack/material/glass, /obj/item/stack/material/glass/fifty)
|
||||
if(/obj/item/stack/material/glass)
|
||||
return "glass"
|
||||
if(/obj/item/stack/material/gold, /obj/item/stack/material/gold/fifty)
|
||||
if(/obj/item/stack/material/gold)
|
||||
return "gold"
|
||||
if(/obj/item/stack/material/silver, /obj/item/stack/material/silver/fifty)
|
||||
if(/obj/item/stack/material/silver)
|
||||
return "silver"
|
||||
if(/obj/item/stack/material/phoron, /obj/item/stack/material/phoron/fifty)
|
||||
if(/obj/item/stack/material/phoron)
|
||||
return "phoron"
|
||||
if(/obj/item/stack/material/uranium, /obj/item/stack/material/uranium/fifty)
|
||||
if(/obj/item/stack/material/uranium)
|
||||
return "uranium"
|
||||
if(/obj/item/stack/material/diamond, /obj/item/stack/material/diamond/fifty)
|
||||
if(/obj/item/stack/material/diamond)
|
||||
return "diamond"
|
||||
|
||||
/obj/machinery/r_n_d/proc/eject(var/material, var/amount)
|
||||
|
||||
20199
maps/polaris-1.dmm
20199
maps/polaris-1.dmm
File diff suppressed because it is too large
Load Diff
@@ -795,6 +795,7 @@
|
||||
#include "code\game\objects\items\robot\robot_items.dm"
|
||||
#include "code\game\objects\items\robot\robot_parts.dm"
|
||||
#include "code\game\objects\items\robot\robot_upgrades.dm"
|
||||
#include "code\game\objects\items\stacks\fifty_spawner.dm"
|
||||
#include "code\game\objects\items\stacks\matter_synth.dm"
|
||||
#include "code\game\objects\items\stacks\medical.dm"
|
||||
#include "code\game\objects\items\stacks\nanopaste.dm"
|
||||
@@ -802,6 +803,7 @@
|
||||
#include "code\game\objects\items\stacks\stack.dm"
|
||||
#include "code\game\objects\items\stacks\telecrystal.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\leather.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
|
||||
#include "code\game\objects\items\weapons\AI_modules.dm"
|
||||
#include "code\game\objects\items\weapons\autopsy.dm"
|
||||
@@ -1413,6 +1415,7 @@
|
||||
#include "code\modules\maps\reader.dm"
|
||||
#include "code\modules\maps\swapmaps.dm"
|
||||
#include "code\modules\maps\writer.dm"
|
||||
#include "code\modules\materials\fifty_spawner_mats.dm"
|
||||
#include "code\modules\materials\material_recipes.dm"
|
||||
#include "code\modules\materials\material_sheets.dm"
|
||||
#include "code\modules\materials\material_synth.dm"
|
||||
|
||||
Reference in New Issue
Block a user