From 2098a55ae7bb1c2d6c78edba0f82a3b750985560 Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 01:18:26 -0500 Subject: [PATCH 1/5] Adds in the other carpet types as a buyable crate. --- code/game/objects/items/stacks/tiles/tile_types.dm | 4 ++-- vorestation.dme | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 901158ffe0..38efb1b544 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,7 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/obj/item/stack/tile/carpet/bcarpet +/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" @@ -105,7 +105,7 @@ /obj/item/stack/tile/carpet/purcarpet icon_state = "tile-carpet" /obj/item/stack/tile/carpet/oracarpet - icon_state = "tile-carpet" + icon_state = "tile-carpet"*/ /obj/item/stack/tile/floor name = "floor tile" diff --git a/vorestation.dme b/vorestation.dme index 9f2d8b6601..86615c68d1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -416,6 +416,7 @@ #include "code\datums\supplypacks\hydroponics.dm" #include "code\datums\supplypacks\hydroponics_vr.dm" #include "code\datums\supplypacks\materials.dm" +#include "code\datums\supplypacks\materials_yw.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\medical_vr.dm" #include "code\datums\supplypacks\misc.dm" @@ -1201,7 +1202,9 @@ #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\sheets\leather.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm" +#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles_yw.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" +#include "code\game\objects\items\stacks\tiles\tile_types_yw.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\bones.dm" From 8221cbc4adb80910ca71382d1a63c3fb9d19a656 Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 01:25:23 -0500 Subject: [PATCH 2/5] Adds in the files because I'm a dummy --- code/datums/supplypacks/materials_yw.dm | 14 ++++++++++ .../stacks/tiles/fifty_spawner_tiles_yw.dm | 27 +++++++++++++++++++ .../objects/items/stacks/tiles/tile_types.dm | 2 +- .../items/stacks/tiles/tile_types_yw.dm | 21 +++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 code/datums/supplypacks/materials_yw.dm create mode 100644 code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm create mode 100644 code/game/objects/items/stacks/tiles/tile_types_yw.dm diff --git a/code/datums/supplypacks/materials_yw.dm b/code/datums/supplypacks/materials_yw.dm new file mode 100644 index 0000000000..b56127433b --- /dev/null +++ b/code/datums/supplypacks/materials_yw.dm @@ -0,0 +1,14 @@ +/datum/supply_pack/materials/carpet_fancy + name = "Fancy Imported carpet" + containertype = /obj/structure/closet/crate + containername = "Fancy Imported carpet crate" + cost = 50 + contains = list( + /obj/fiftyspawner/bcarpet, + /obj/fiftyspawner/blucarpet, + /obj/fiftyspawner/turcarpet, + /obj/fiftyspawner/sblucarpet, + /obj/fiftyspawner/gaycarpet, + /obj/fiftyspawner/purcarpet, + /obj/fiftyspawner/oracarpet + ) \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm new file mode 100644 index 0000000000..6b1018021b --- /dev/null +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm @@ -0,0 +1,27 @@ +/obj/fiftyspawner/bcarpet + name = "stack of black carpet" + type_to_spawn = /obj/item/stack/tile/carpet/bcarpet + +/obj/fiftyspawner/blucarpet + name = "stack of blue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/blucarpet + +/obj/fiftyspawner/turcarpet + name = "stack of tue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/turcarpet + +/obj/fiftyspawner/sblucarpet + name = "stack of silver blue carpet" + type_to_spawn = /obj/item/stack/tile/carpet/sblucarpet + +/obj/fiftyspawner/gaycarpet + name = "stack of clown carpet" + type_to_spawn = /obj/item/stack/tile/carpet/gaycarpet + +/obj/fiftyspawner/purcarpet + name = "stack of purple carpet" + type_to_spawn = /obj/item/stack/tile/carpet/purcarpet + +/obj/fiftyspawner/oracarpet + name = "stack of orange carpet" + type_to_spawn = /obj/item/stack/tile/carpet/oracarpet \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 38efb1b544..5a62b39671 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,7 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. +/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" diff --git a/code/game/objects/items/stacks/tiles/tile_types_yw.dm b/code/game/objects/items/stacks/tiles/tile_types_yw.dm new file mode 100644 index 0000000000..a78efd1045 --- /dev/null +++ b/code/game/objects/items/stacks/tiles/tile_types_yw.dm @@ -0,0 +1,21 @@ +/obj/item/stack/tile/carpet/bcarpet + name = "black carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/blucarpet + name = "blue carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/turcarpet + name = "tur carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/sblucarpet + name = "silver blue carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/gaycarpet + name = "Clown Carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/purcarpet + name = "purple carpet" + icon_state = "tile-carpet" +/obj/item/stack/tile/carpet/oracarpet + name = "orange carpet" + icon_state = "tile-carpet" \ No newline at end of file From cf891ce999e8c565e45989ad17e960e3ae63e249 Mon Sep 17 00:00:00 2001 From: Izac Joof Forsgren Date: Sat, 4 Jul 2020 08:26:15 +0200 Subject: [PATCH 3/5] Update code/game/objects/items/stacks/tiles/tile_types.dm --- code/game/objects/items/stacks/tiles/tile_types.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 5a62b39671..1b7d04b14a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -92,7 +92,8 @@ icon_state = "tile-tealcarpet" no_variants = FALSE -/*/obj/item/stack/tile/carpet/bcarpet //Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw +/*/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw + icon_state = "tile-carpet" /obj/item/stack/tile/carpet/blucarpet icon_state = "tile-carpet" @@ -238,4 +239,4 @@ uses_charge = 1 charge_costs = list(250) stacktype = /obj/item/stack/tile/roofing - build_type = /obj/item/stack/tile/roofing \ No newline at end of file + build_type = /obj/item/stack/tile/roofing From 925657e9d0f26287a9bccbe1f8ce9bb06f4e145c Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 03:56:00 -0500 Subject: [PATCH 4/5] AAAAAAAAAAAAAAAAAAAAAAAAAAA --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ad06a4bdf..7fb49ca3dd 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,4 @@ For a basic setup, simply copy every file from config/example to config. ### SQL Setup -The SQL backend for the library and stats tracking requires a MySQL server. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql. More detailed setup instructions arecoming soon, for now ask in our Discord. \ No newline at end of file +The SQL backend for the library and stats tracking requires a MySQL server. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql. More detailed setup instructions arecoming soon, for now ask in our Discord. From aae26a2b548c6d9e1d30fba297c15c3a676ec52d Mon Sep 17 00:00:00 2001 From: Luke Vale Date: Sat, 4 Jul 2020 04:03:19 -0500 Subject: [PATCH 5/5] more screaming --- code/datums/supplypacks/materials_yw.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks/materials_yw.dm b/code/datums/supplypacks/materials_yw.dm index b56127433b..de73a90b35 100644 --- a/code/datums/supplypacks/materials_yw.dm +++ b/code/datums/supplypacks/materials_yw.dm @@ -11,4 +11,4 @@ /obj/fiftyspawner/gaycarpet, /obj/fiftyspawner/purcarpet, /obj/fiftyspawner/oracarpet - ) \ No newline at end of file + ) //REEE \ No newline at end of file