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

Buffs Brass - Adds a Selection of New Brass Furnishings (#27465)

Browse Source 
* creation

* Update clockwork-overlays.dmi

* Update computer.dmi

* Update computer.dmi

* Update Operating.dm

* airlock

* Update airlock_types.dm

* Update code/game/machinery/Sleeper.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-12-10 16:04:47 +00:00
committed by GitHub
co-authored by DGamerL
parent 27a7da7f49
commit c6fcd16078
12 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/door_assembly_types.dm
+6
View File
@@ -186,6 +186,12 @@
overlays_file = GET_CULT_DATA(airlock_unruned_overlays_file, initial(overlays_file))
update_icon()
/obj/structure/door_assembly/door_assembly_clockwork
icon = 'icons/obj/doors/airlocks/clockwork/clockwork.dmi'
overlays_file = 'icons/obj/doors/airlocks/clockwork/clockwork-overlays.dmi'
airlock_type = /obj/machinery/door/airlock/clockwork
glass_type = /obj/machinery/door/airlock/clockwork/glass
/obj/structure/door_assembly/door_assembly_centcom
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
code/game/objects/structures/shelves.dm
+20 -2
View File
@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
var/shelf_style = "basic"
/// The current overlay of the top shelf. Used for interleaving objects and shelf layers for the illusion of depth.
var/image/shelf_overlay
var/build_stack_type = /obj/item/stack/sheet/metal
COOLDOWN_DECLARE(spraypaint_cd)
/obj/structure/shelf/Initialize(mapload)
@@ -30,9 +31,14 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
var/obj/item/toy/crayon/spraycan/spraycan = I
if(!istype(spraycan))
return ..()
if(spraycan.capped)
return ..()
// Spraypaint cannot turn brass into steel.
if(shelf_style == "clockwork")
return ..()
if(!COOLDOWN_FINISHED(src, spraypaint_cd))
to_chat(user, "<span class='warning'>The paint on [src] is still drying!</span>")
return
@@ -74,7 +80,7 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
deconstruct()
/obj/structure/shelf/deconstruct(disassembled)
new /obj/item/stack/sheet/metal(get_turf(src), 5)
new build_stack_type(get_turf(src), 5)
return ..()
/obj/structure/shelf/engineering
@@ -105,6 +111,12 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
icon_state = "shelf_sup"
shelf_style = "sup"
/obj/structure/shelf/clockwork
name = "brass shelf"
icon_state = "shelf_clockwork"
shelf_style = "clockwork"
build_stack_type = /obj/item/stack/tile/brass
/obj/structure/gunrack
name = "gun rack"
desc = "A rack for stowing firearms."
@@ -115,6 +127,7 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
anchored = TRUE
pass_flags_self = PASSTAKE
max_integrity = 80
var/build_stack_type = /obj/item/stack/sheet/metal
/obj/structure/gunrack/Initialize(mapload)
. = ..()
@@ -135,5 +148,10 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
deconstruct()
/obj/structure/gunrack/deconstruct(disassembled)
new /obj/item/stack/sheet/metal(get_turf(src), 5)
new build_stack_type(get_turf(src), 5)
return ..()
/obj/structure/gunrack/clockwork
name = "brass weapon rack"
icon_state = "gunrack_clockwork"
build_stack_type = /obj/item/stack/tile/brass
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+13
View File
@@ -373,6 +373,19 @@
/obj/structure/chair/sofa/pew/right
icon_state = "pewend_right"
/obj/structure/chair/sofa/pew/clockwork
name = "brass pew"
desc = "An ornate pew fashioned from brass. It is even less comfortable than a regular pew, but it does radiate a pleasent warmth."
icon_state = "clockwork_pew_middle"
buildstacktype = /obj/item/stack/tile/brass
buildstackamount = 5
/obj/structure/chair/sofa/pew/clockwork/left
icon_state = "clockwork_pew_left"
/obj/structure/chair/sofa/pew/clockwork/right
icon_state = "clockwork_pew_right"
/obj/structure/chair/sofa/bench
name = "bench"
desc = "You sit in this. Either by will or force."