cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #20076 Plasmaglass and plasmarglass now returns the correct amount of materials (#20079)

Browse Source 
* Plasmaglass and Plasmarglass now returns the correct amount of materials

* forgot alien alloy
This commit is contained in:
Henri215
2023-01-03 17:48:58 -03:00
committed by GitHub
parent c5d58bd697
commit ad608cf016
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+6 -6
View File
@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(glass_recipes, list (
singular_name = "glass sheet"
icon_state = "sheet-glass"
item_state = "sheet-glass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=1"
@@ -103,7 +103,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list (
desc = "Glass which seems to have rods or something stuck in them."
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 70, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=2"
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list (
singular_name = "glass sheet"
icon_state = "sheet-plasmaglass"
item_state = "sheet-plasmaglass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list (
singular_name = "reinforced plasma glass sheet"
icon_state = "sheet-plasmarglass"
item_state = "sheet-plasmarglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
singular_name = "titanium glass sheet"
icon_state = "sheet-titaniumglass"
item_state = "sheet-titaniumglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/titaniumglass
@@ -240,7 +240,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
singular_name = "plastitanium glass sheet"
icon_state = "sheet-plastitaniumglass"
item_state = "sheet-plastitaniumglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plastitaniumglass
code/game/objects/items/stacks/sheets/mineral.dm
+10 -10
View File
@@ -154,7 +154,7 @@ GLOBAL_LIST_INIT(snow_recipes, list(
throw_range = 5
origin_tech = "materials=1"
sheettype = "sandstone"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/sheet/mineral/sandstone/fifty
amount = 50
@@ -209,7 +209,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=6"
sheettype = "diamond"
merge_type = /obj/item/stack/sheet/mineral/diamond
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_DIAMOND = MINERAL_MATERIAL_AMOUNT)
point_value = 25
/obj/item/stack/sheet/mineral/diamond/New()
@@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=5"
sheettype = "uranium"
merge_type = /obj/item/stack/sheet/mineral/uranium
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT)
point_value = 20
/obj/item/stack/sheet/mineral/uranium/fifty
@@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
merge_type = /obj/item/stack/sheet/mineral/plasma
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
resistance_flags = FLAMMABLE
max_integrity = 100
point_value = 20
@@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=4"
sheettype = "gold"
merge_type = /obj/item/stack/sheet/mineral/gold
materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_GOLD = MINERAL_MATERIAL_AMOUNT)
point_value = 20
/obj/item/stack/sheet/mineral/gold/fifty
@@ -307,7 +307,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=4"
sheettype = "silver"
merge_type = /obj/item/stack/sheet/mineral/silver
materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_SILVER = MINERAL_MATERIAL_AMOUNT)
point_value = 20
/obj/item/stack/sheet/mineral/silver/fifty
@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=4"
sheettype = "bananium"
merge_type = /obj/item/stack/sheet/mineral/bananium
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_BANANIUM = MINERAL_MATERIAL_AMOUNT)
point_value = 50
/obj/item/stack/sheet/mineral/bananium/fifty
@@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
origin_tech = "materials=4"
sheettype = "tranquillite"
merge_type = /obj/item/stack/sheet/mineral/tranquillite
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_TRANQUILLITE = MINERAL_MATERIAL_AMOUNT)
wall_allowed = FALSE //no tranquilite walls in code
point_value = 50
@@ -369,7 +369,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
throw_range = 3
sheettype = "titanium"
merge_type = /obj/item/stack/sheet/mineral/titanium
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT)
point_value = 20
GLOBAL_LIST_INIT(titanium_recipes, list(
@@ -402,7 +402,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list(
throw_range = 3
sheettype = "plastitanium"
merge_type = /obj/item/stack/sheet/mineral/plastitanium
materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000)
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
point_value = 45
/obj/item/stack/sheet/mineral/plastitanium/fifty
code/game/objects/items/stacks/sheets/sheet_types.dm
+2 -2
View File
@@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(metal_recipes, list(
desc = "Sheets made out of metal."
singular_name = "metal sheet"
icon_state = "sheet-metal"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT)
throwforce = 10.0
flags = CONDUCT
resistance_flags = FIRE_PROOF
@@ -170,7 +170,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list(
desc = "This sheet is an alloy of iron and plasma."
icon_state = "sheet-plasteel"
item_state = "sheet-plasteel"
materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
resistance_flags = FIRE_PROOF
throwforce = 10.0