cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6567, tidying up glass code and #6575, #6577 (#6576)

Browse Source
This commit is contained in:
alsoandanswer
2019-06-25 23:39:04 +08:00
committed by Werner
parent cede754944
commit 53c5ff67a5
18 changed files with 160 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
code/game/objects/items/stacks/sheets/glass.dm
View File

@@ -2,6 +2,7 @@
* Contains:
* Glass sheets
* Reinforced glass sheets
* Wired glass sheets
* Phoron Glass Sheets
* Reinforced Phoron Glass Sheets (AKA Holy fuck strong windows)
* Glass shards - TODO: Move this into code/game/object/item/weapons
@@ -24,36 +25,6 @@
/obj/item/stack/material/glass/attack_self(mob/user as mob)
construct_window(user)
/obj/item/stack/material/glass/attackby(obj/item/W, mob/user)
..()
if(!is_reinforced)
if(W.iscoil())
var/obj/item/stack/cable_coil/CC = W
if (get_amount() < 1 || CC.get_amount() < 5)
to_chat(user, "<span class='warning'>You need five lengths of coil and one sheet of glass to make wired glass.</span>")
return
CC.use(5)
use(1)
to_chat(user, "<span class='notice'>You attach wire to the [name].</span>")
new /obj/item/stack/light_w(user.loc)
else if(istype(W, /obj/item/stack/rods))
var/obj/item/stack/rods/V = W
if (V.get_amount() < 1 || get_amount() < 1)
to_chat(user, "<span class='warning'>You need one rod and one sheet of glass to make reinforced glass.</span>")
return
var/obj/item/stack/material/glass/reinforced/RG = new (user.loc)
RG.add_fingerprint(user)
RG.add_to_stacks(user)
var/obj/item/stack/material/glass/G = src
src = null
var/replace = (user.get_inactive_hand()==G)
V.use(1)
G.use(1)
if (!G && replace)
user.put_in_hands(RG)
/obj/item/stack/material/glass/proc/construct_window(mob/user as mob)
if(!user || !src) return 0
if(!istype(user.loc,/turf)) return 0
@@ -137,6 +108,40 @@
is_reinforced = 1
construction_options = list("One Direction", "Full Window", "Windoor")
/*
* Wired glass sheets
*/
/obj/item/stack/material/glass/wired
name = "wired glass tile"
singular_name = "wired glass floor tile"
desc = "A glass tile, which is wired, somehow."
icon = 'icons/obj/stacks/tiles.dmi'
icon_state = "glass_wire"
created_window = null
default_type = "wired glass"
construction_options = list()
/obj/item/stack/material/glass/wired/attackby(var/obj/O, mob/user as mob)
if(istype(O, /obj/item/stack/material/steel))
var/obj/item/stack/material/steel/M = O
if (M.use(1))
var/obj/item/L = new /obj/item/stack/tile/light
user.drop_from_inventory(L,get_turf(src))
to_chat(user, "<span class='notice'>You make a light tile.</span>")
use(1)
else
to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
else if(istype(O, /obj/item/weapon/wirecutters))
user.drop_from_inventory(O,get_turf(src))
to_chat(user, "<span class='notice'>You detach the wire from the [name].</span>")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/cable_coil(user.loc, 5)
new /obj/item/stack/material/glass(user.loc)
use(1)
else
return ..()
/*
* Phoron Glass sheets
*/
@@ -148,23 +153,6 @@
default_type = "phoron glass"
icon_has_variants = FALSE
/obj/item/stack/material/glass/phoronglass/attackby(obj/item/W, mob/user)
..()
if( istype(W, /obj/item/stack/rods) )
var/obj/item/stack/rods/V = W
var/obj/item/stack/material/glass/phoronrglass/RG = new (user.loc)
RG.add_fingerprint(user)
RG.add_to_stacks(user)
V.use(1)
var/obj/item/stack/material/glass/G = src
src = null
var/replace = (user.get_inactive_hand()==G)
G.use(1)
if (!G && !RG && replace)
user.put_in_hands(RG)
else
return ..()
/*
* Reinforced phoron glass sheets
*/

31
code/game/objects/items/stacks/sheets/light.dm
View File

@@ -1,31 +0,0 @@
/obj/item/stack/light_w
name = "wired glass tile"
singular_name = "wired glass floor tile"
desc = "A glass tile, which is wired, somehow."
icon = 'icons/obj/stacks/tiles.dmi'
icon_state = "glass_wire"
force = 3
throwforce = 5
throw_speed = 3
throw_range = 7
max_amount = 60
/obj/item/stack/light_w/attackby(var/obj/O, mob/user as mob)
if(istype(O, /obj/item/stack/material/steel))
var/obj/item/stack/material/steel/M = O
if (M.use(1))
var/obj/item/L = new /obj/item/stack/tile/light
user.drop_from_inventory(L,get_turf(src))
to_chat(user, "<span class='notice'>You make a light tile.</span>")
use(1)
else
to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
else if(istype(O, /obj/item/weapon/wirecutters))
user.drop_from_inventory(O,get_turf(src))
to_chat(user, "<span class='notice'>You detach the wire from the [name].</span>")
new /obj/item/stack/cable_coil(user.loc)
new /obj/item/stack/material/glass(user.loc)
use(1)
else
return ..()

12
code/game/objects/items/stacks/tiles/light.dm
View File

@@ -20,8 +20,18 @@
/obj/item/stack/tile/light/attackby(var/obj/item/O, var/mob/user)
if(istype(O, /obj/item/weapon/crowbar))
amount--
new /obj/item/stack/light_w(user.loc)
to_chat(user, "<span class='notice'>You pry off the steel sheet from the [name].</span>")
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
new /obj/item/stack/material/glass/wired(user.loc)
new /obj/item/stack/material/steel(user.loc)
if(amount <= 0)
qdel(src)
else
return ..()
/obj/item/stack/tile/light/attack_self(mob/user)
amount--
playsound(src.loc, 'sound/items/Deconstruct.ogg', 80, 1)
new /obj/machinery/floor_light(user.loc)
if(amount <= 0)
qdel(src)