diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 993be0c6192..60ac94e3a5f 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -61,6 +61,9 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_CARPET_RED S_TURF(17) ///turf/open/floor/carpet/red #define SMOOTH_GROUP_CARPET_ROYAL_BLACK S_TURF(18) ///turf/open/floor/carpet/royalblack #define SMOOTH_GROUP_CARPET_ROYAL_BLUE S_TURF(19) ///turf/open/floor/carpet/royalblue +#define SMOOTH_GROUP_CARPET_EXECUTIVE S_TURF(20) ///turf/open/floor/carpet/executive +#define SMOOTH_GROUP_CARPET_STELLAR S_TURF(21) ///turf/open/floor/carpet/stellar +#define SMOOTH_GROUP_CARPET_DONK S_TURF(22) ///turf/open/floor/carpet/donk #define SMOOTH_GROUP_CLOSED_TURFS S_TURF(24) ///turf/closed #define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(25) ///turf/closed/wall/material diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index eb85a666319..9552b52b200 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -674,3 +674,39 @@ /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1 ) + +/obj/effect/spawner/lootdrop/decorative_material + lootcount = 1 + loot = list( + /obj/item/stack/sheet/sandblock{amount = 30} = 25, + /obj/item/stack/sheet/mineral/wood{amount = 30} = 25, + /obj/item/stack/tile/bronze/thirty = 20, + /obj/item/stack/tile/noslip{amount = 20} = 10, + /obj/item/stack/sheet/plastic{amount = 30} = 10, + /obj/item/stack/tile/pod{amount = 20} = 4, + /obj/item/stack/tile/pod/light{amount = 20} = 3, + /obj/item/stack/tile/pod/dark{amount = 20} = 3, + ) + +/obj/effect/spawner/lootdrop/maintenance_carpet + lootcount = 1 + loot = list( + /obj/item/stack/tile/carpet{amount = 30} = 35, + /obj/item/stack/tile/carpet/black{amount = 30} = 20, + /obj/item/stack/tile/carpet/donk/thirty = 15, + /obj/item/stack/tile/carpet/stellar/thirty = 15, + /obj/item/stack/tile/carpet/executive/thirty = 15, + ) + +/obj/effect/spawner/lootdrop/decorations_spawner + lootcount = 1 + loot = list( + /obj/effect/spawner/lootdrop/maintenance_carpet = 25, + /obj/effect/spawner/lootdrop/decorative_material = 25, + /obj/item/sign = 10, + /obj/item/flashlight/lamp/green = 10, + /obj/item/plaque = 5, + /obj/item/flashlight/lantern/jade = 5, + /obj/item/phone = 5, + /obj/item/flashlight/lamp/bananalamp = 3 + ) diff --git a/code/game/objects/effects/spawners/lootsite.dm b/code/game/objects/effects/spawners/lootsite.dm index f4c33bafbe7..e1668e60565 100644 --- a/code/game/objects/effects/spawners/lootsite.dm +++ b/code/game/objects/effects/spawners/lootsite.dm @@ -4,11 +4,12 @@ icon_state = "loot_site" ///This is the loot table for the spawner. Try to make sure the weights add up to 1000, so it is easy to understand. var/list/loot_table = list(/obj/structure/closet/crate/maint = 765, - /obj/structure/closet/crate/trashcart/filled = 80, + /obj/structure/closet/crate/trashcart/filled = 75, /obj/effect/spawner/bundle/moisture_trap = 50, - /obj/effect/spawner/bundle/hobo_squat = 35, - /obj/structure/closet/mini_fridge = 40, - /obj/effect/spawner/lootdrop/gross_decal_spawner = 30) + /obj/effect/spawner/bundle/hobo_squat = 30, + /obj/structure/closet/mini_fridge = 35, + /obj/effect/spawner/lootdrop/gross_decal_spawner = 30, + /obj/structure/closet/crate/decorations = 15) /obj/effect/loot_site_spawner/Initialize() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 3b5eb9a07ed..926960c6814 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -207,6 +207,23 @@ turf_type = /turf/open/floor/carpet/royalblue tableVariant = /obj/structure/table/wood/fancy/royalblue +/obj/item/stack/tile/carpet/executive + name = "executive carpet" + icon_state = "tile_carpet_executive" + inhand_icon_state = "tile-carpet-royalblue" + turf_type = /turf/open/floor/carpet/executive + +/obj/item/stack/tile/carpet/stellar + name = "stellar carpet" + icon_state = "tile_carpet_stellar" + inhand_icon_state = "tile-carpet-royalblue" + turf_type = /turf/open/floor/carpet/stellar + +/obj/item/stack/tile/carpet/donk + name = "donk co promotional carpet" + icon_state = "tile_carpet_donk" + inhand_icon_state = "tile-carpet-orange" + turf_type = /turf/open/floor/carpet/donk /obj/item/stack/tile/carpet/fifty amount = 50 @@ -238,6 +255,14 @@ /obj/item/stack/tile/carpet/royalblue/fifty amount = 50 +/obj/item/stack/tile/carpet/executive/thirty + amount = 30 + +/obj/item/stack/tile/carpet/stellar/thirty + amount = 30 + +/obj/item/stack/tile/carpet/donk/thirty + amount = 30 /obj/item/stack/tile/fakespace name = "astral carpet" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 7af616d6dc6..4c92ce90129 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -249,3 +249,11 @@ ..() for(var/i in 1 to 5) new /obj/item/coin/silver(src) + +/obj/structure/closet/crate/decorations + icon_state = "engi_crate" + +/obj/structure/closet/crate/decorations/PopulateContents() + . = ..() + for(var/i in 1 to 4) + new /obj/effect/spawner/lootdrop/decorations_spawner(src) diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 9484be34503..892244d7c4e 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -290,6 +290,33 @@ smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_ROYAL_BLUE) canSmoothWith = list(SMOOTH_GROUP_CARPET_ROYAL_BLUE) +/turf/open/floor/carpet/executive + name = "executive carpet" + icon = 'icons/turf/floors/carpet_executive.dmi' + icon_state = "executive_carpet-255" + base_icon_state = "executive_carpet" + floor_tile = /obj/item/stack/tile/carpet/executive + smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_EXECUTIVE) + canSmoothWith = list(SMOOTH_GROUP_CARPET_EXECUTIVE) + +/turf/open/floor/carpet/stellar + name = "stellar carpet" + icon = 'icons/turf/floors/carpet_stellar.dmi' + icon_state = "stellar_carpet-255" + base_icon_state = "stellar_carpet" + floor_tile = /obj/item/stack/tile/carpet/stellar + smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_STELLAR) + canSmoothWith = list(SMOOTH_GROUP_CARPET_STELLAR) + +/turf/open/floor/carpet/donk + name = "Donk Co. carpet" + icon = 'icons/turf/floors/carpet_donk.dmi' + icon_state = "donk_carpet-255" + base_icon_state = "donk_carpet" + floor_tile = /obj/item/stack/tile/carpet/donk + smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_DONK) + canSmoothWith = list(SMOOTH_GROUP_CARPET_DONK) + //*****Airless versions of all of the above.***** /turf/open/floor/carpet/airless initial_gas_mix = AIRLESS_ATMOS diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 905b2dc6f92..7983fba9a05 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors/carpet_donk.dmi b/icons/turf/floors/carpet_donk.dmi new file mode 100644 index 00000000000..04c4148d2bc Binary files /dev/null and b/icons/turf/floors/carpet_donk.dmi differ diff --git a/icons/turf/floors/carpet_executive.dmi b/icons/turf/floors/carpet_executive.dmi new file mode 100644 index 00000000000..2c17e542fcd Binary files /dev/null and b/icons/turf/floors/carpet_executive.dmi differ diff --git a/icons/turf/floors/carpet_stellar.dmi b/icons/turf/floors/carpet_stellar.dmi new file mode 100644 index 00000000000..6ba81678426 Binary files /dev/null and b/icons/turf/floors/carpet_stellar.dmi differ