cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further Updates Windows (#15427)

Browse Source 
* Further Updates Windows

* correction
This commit is contained in:
Fox McCloud
2021-02-03 10:04:52 +00:00
committed by GitHub
parent 38d1c93586
commit 6074323192
10 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/windowspawner.dm
+29 -2
View File
@@ -41,13 +41,40 @@
window_to_spawn_regular = /obj/structure/window/reinforced
window_to_spawn_full = /obj/structure/window/full/reinforced
/obj/effect/spawner/window/plasma
name = "plasma window spawner"
icon_state = "pwindow_spawner"
window_to_spawn_regular = /obj/structure/window/plasmabasic
window_to_spawn_full = /obj/structure/window/full/plasmabasic
/obj/effect/spawner/window/reinforced/plasma
name = "reinforced plasma window spawner"
icon_state = "pwindow_spawner"
icon_state = "prwindow_spawner"
window_to_spawn_regular = /obj/structure/window/plasmareinforced
window_to_spawn_full = /obj/structure/window/full/plasmareinforced
/obj/effect/spawner/window/reinforced/tinted
name = "tinted reinforced window spawner"
icon_state = "twindow_spawner"
window_to_spawn_regular = /obj/structure/window/reinforced/tinted
window_to_spawn_full = /obj/structure/window/full/reinforced/tinted
/obj/effect/spawner/window/shuttle
name = "shuttle window spawner"
icon_state = "swindow_spawner"
window_to_spawn_full = /obj/structure/window/shuttle
window_to_spawn_full = /obj/structure/window/full/shuttle
/obj/effect/spawner/window/shuttle/survival_pod
name = "pod window spawner"
icon_state = "podwindow_spawner"
window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod
/obj/effect/spawner/window/plastitanium
name = "plastitanium window spawner"
icon_state = "plastitaniumwindow_spawner"
window_to_spawn_full = /obj/structure/window/full/plastitanium
/obj/effect/spawner/window/ice
name = "ice window spawner"
icon_state = "icewindow_spawner"
window_to_spawn_full = /obj/structure/window/full/reinforced/ice
code/game/objects/items/stacks/sheets/glass.dm
+2 -2
View File
@@ -191,7 +191,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
..()
GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
))
/obj/item/stack/sheet/plastitaniumglass
@@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
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
full_window = /obj/structure/window/plastitanium
full_window = /obj/structure/window/full/plastitanium
/obj/item/stack/sheet/plastitaniumglass/New(loc, amount)
recipes = GLOB.plastitaniumglass_recipes
code/game/objects/structures/window.dm
+1 -6
View File
@@ -669,15 +669,12 @@
/obj/structure/window/full/shuttle/tinted
opacity = TRUE
/obj/structure/window/plastitanium
/obj/structure/window/full/plastitanium
name = "plastitanium window"
desc = "An evil looking window of plasma and titanium."
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
icon_state = "plastitanium_window"
dir = FULLTILE_WINDOW_DIR
max_integrity = 100
fulltile = TRUE
flags = PREVENT_CLICK_UNDER
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
@@ -685,9 +682,7 @@
smooth = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
level = 3
glass_type = /obj/item/stack/sheet/plastitaniumglass
glass_amount = 2
/obj/structure/window/reinforced/clockwork
name = "brass window"