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

Adds Flock Tables and Shelves (#32361)

Browse Source 
* Adds flock tables

* Flock!

* Update shelves.dm

* crafting

* Apply suggestion from @alfalfascout

Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* comma

* Update code/__DEFINES/icon_smoothing_defines.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
CRUNCH
2026-08-25 04:49:20 +00:00
committed by GitHub
co-authored by Alan PollardTheDragon
parent e871d9cde4
commit bd9bcd55ab
9 changed files with 83 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/mineral.dm
+2
View File
@@ -141,6 +141,8 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
GLOBAL_LIST_INIT(gnesis_recipes, list (
new /datum/stack_recipe("flock chair", /obj/structure/chair/comfy/flock, 2, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("flock table", /obj/structure/table/reinforced/flock, 2, time = 5.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("flock shelf", /obj/structure/shelf/flock, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("flock closet", /obj/structure/closet/flock, 2, time = 10 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("flock grille", /obj/structure/grille/flock, 1, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("flock door", /obj/machinery/door/flock, 10, time = 10 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
code/game/objects/structures/shelves.dm
+4
View File
@@ -85,6 +85,10 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
new build_stack_type(get_turf(src), 5)
return ..()
/obj/structure/shelf/try_flock_convert(datum/flock/flock, force)
new /obj/structure/shelf/flock(loc)
qdel(src)
/obj/structure/shelf/engineering
icon_state = "shelf_engi"
shelf_style = "engi"
code/game/objects/structures/tables_racks.dm
+4
View File
@@ -105,6 +105,10 @@
new /obj/structure/table/reinforced/cult(loc)
qdel(src)
/obj/structure/table/try_flock_convert(datum/flock/flock, force)
new /obj/structure/table/reinforced/flock(loc)
qdel(src)
/obj/structure/table/start_climb(mob/living/user)
. = ..()
item_placed(user)