shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes plasma glass merging with normal glass

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-08 09:45:46 -05:00
parent 2e4624ee3f
commit 2d84e09851
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+9 -9
View File
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
new/datum/stack_recipe("fulltile window", /obj/structure/window/plasma/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
))
/obj/item/stack/sheet/glass/plasma
/obj/item/stack/sheet/plasmaglass
name = "plasma glass"
desc = "A glass sheet made out of a plasma-silicate alloy. It looks extremely tough and heavily fire resistant."
singular_name = "plasma glass sheet"
@@ -80,22 +80,22 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
origin_tech = "plasmatech=2;materials=2"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/glass/plasma
merge_type = /obj/item/stack/sheet/plasmaglass
/obj/item/stack/sheet/glass/plasma/fifty
/obj/item/stack/sheet/plasmaglass/fifty
amount = 50
/obj/item/stack/sheet/glass/plasma/Initialize(mapload, new_amount, merge = TRUE)
/obj/item/stack/sheet/plasmaglass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.pglass_recipes
return ..()
/obj/item/stack/sheet/glass/plasma/attackby(obj/item/W, mob/user, params)
/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/stack/rods))
var/obj/item/stack/rods/V = W
if (V.get_amount() >= 1 && get_amount() >= 1)
var/obj/item/stack/sheet/rglass/plasma/RG = new (get_turf(user))
var/obj/item/stack/sheet/plasmarglass/RG = new (get_turf(user))
RG.add_fingerprint(user)
var/replace = user.get_inactive_held_item()==src
V.use(1)
@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/plasma/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
))
/obj/item/stack/sheet/rglass/plasma
/obj/item/stack/sheet/plasmarglass
name = "reinforced plasma glass"
desc = "A glass sheet made out of a plasma-silicate alloy and a rod matrice. It looks hopelessly tough and nearly fire-proof!"
singular_name = "reinforced plasma glass sheet"
@@ -171,9 +171,9 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
origin_tech = "materials=2;plasmatech=2"
armor = list("melee" = 20, "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/rglass/plasma
merge_type = /obj/item/stack/sheet/plasmarglass
/obj/item/stack/sheet/rglass/Initialize(mapload, new_amount, merge = TRUE)
/obj/item/stack/sheet/plasmarglass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.prglass_recipes
return ..()
code/game/objects/structures/window.dm
+2 -2
View File
@@ -434,7 +434,7 @@
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 00, "acid" = 100)
max_integrity = 50
explosion_block = 1
glass_type = /obj/item/stack/sheet/glass/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
/obj/structure/window/plasma/unanchored
anchored = FALSE
@@ -448,7 +448,7 @@
armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
max_integrity = 100
explosion_block = 2
glass_type = /obj/item/stack/sheet/rglass/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
/obj/structure/window/plasma/reinforced/unanchored
anchored = FALSE
code/modules/research/designs/smelting_designs.dm
+1 -1
View File
@@ -22,7 +22,7 @@
id = "plasmaglass"
build_type = SMELTER
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/glass/plasma
build_path = /obj/item/stack/sheet/plasmaglass
category = list("initial")
/datum/design/alienalloy