cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

Browse Source 
The stack/fifty objects were really buggy, this should fix all of that in one go.
This commit is contained in:
MagmaRam
2016-12-17 17:27:04 -06:00
parent a1a17a0811
commit 190a2bc70c
12 changed files with 10311 additions and 10247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/fifty_spawner_mats.dm
+97
View 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"
code/modules/materials/material_sheets.dm
+1 -72
View File
@@ -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