diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index a1d4da65bf3..d7951bda7d2 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -172,6 +172,7 @@ /obj/item/clothing/accessory/storage = TRADER_BLACKLIST_ALL, /obj/item/clothing/accessory/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/accessory/armband/fluff = TRADER_BLACKLIST_ALL, + /obj/item/clothing/accessory/poncho/tajarancloak/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/gloves = TRADER_SUBTYPES_ONLY, /obj/item/clothing/gloves/lightrig = TRADER_BLACKLIST_ALL, /obj/item/clothing/gloves/rig = TRADER_BLACKLIST_ALL, diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 7290dd51577..3e92eea088b 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -266,6 +266,7 @@ /obj/item/clothing/suit/storage/toggle/tajaran/wool = TRADER_THIS_TYPE, /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim = TRADER_THIS_TYPE, /obj/item/clothing/accessory/poncho/tajarancloak = TRADER_ALL, + /obj/item/clothing/accessory/poncho/tajarancloak/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/suit/storage/hooded/tajaran = TRADER_ALL, /obj/item/clothing/under/tajaran/fancy = TRADER_THIS_TYPE, /obj/item/clothing/under/tajaran/summer = TRADER_THIS_TYPE, diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index fafdd11fe14..85f014ad20e 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -45,7 +45,8 @@ /obj/item/storage/box/shells/incendiaryshells = TRADER_THIS_TYPE, /obj/item/storage/box/ammo/governmentammo = TRADER_THIS_TYPE, /obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY, - /obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL + /obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL, + /obj/item/clothing/accessory/holster/utility/fluff = TRADER_BLACKLIST_ALL ) /datum/trader/ship/egunshop @@ -80,7 +81,8 @@ /obj/item/gun/energy/laser/shotgun = TRADER_THIS_TYPE, /obj/item/gun/energy/freeze = TRADER_THIS_TYPE, /obj/item/clothing/accessory/holster = TRADER_ALL, - /obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL + /obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL, + /obj/item/clothing/accessory/holster/utility/fluff = TRADER_BLACKLIST_ALL ) /datum/trader/ship/illegalgun diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index 8e4373cc4aa..883e4fcf392 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -1519,7 +1519,7 @@ /singleton/cargo_item/assunzione_wine category = "hospitality" - name = "\improper Assunzioni Sera Stellata di Dalyan Wine" + name = "Assunzioni Sera Stellata di Dalyan Wine" supplier = "getmore" description = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione." price = 50 diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index 19303703b48..a3d3ce724e4 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -9,6 +9,7 @@ contained_sprite = TRUE icon_auto_adapt = TRUE icon_supported_species_tags = list("taj") + color = WOOD_COLOR_GENERIC /obj/item/clothing/shoes/sandals/geta name = "geta" diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm index 7d452ac4b4e..237a5cb07d3 100644 --- a/code/modules/cooking/machinery/commissary.dm +++ b/code/modules/cooking/machinery/commissary.dm @@ -48,7 +48,9 @@ contents_path = "-clothing" accepted_items = list(/obj/item/storage/backpack, /obj/item/storage/belt, - /obj/item/clothing + /obj/item/clothing, + /obj/item/storage/briefcase, + /obj/item/cane ) display_tiers = 3 display_tier_amt = 5 @@ -105,7 +107,8 @@ /obj/item/gun/projectile/revolver/capgun, /obj/item/gun/bang, /obj/item/eightball, - /obj/item/bikehorn + /obj/item/bikehorn, + /obj/item/camera_film ) display_tiers = 4 display_tier_amt = 5 diff --git a/html/changelogs/SmallFixesFromWolf.yml b/html/changelogs/SmallFixesFromWolf.yml new file mode 100644 index 00000000000..935572bcdb4 --- /dev/null +++ b/html/changelogs/SmallFixesFromWolf.yml @@ -0,0 +1,10 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Assunzioni Sera Stellata di Dalyan Wine can be ordered again." + - bugfix: "Sandals now default to being wood colored if not otherwise given color." + - bugfix: "Added camera film to the toy shelf storage and briefcases and canes to the clothing shelf storage." + - bugfix: "Fixed that the operations lobby was powered by the wrong grid." + - bugfix: "Added some custom items to the merchant blacklist." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 173aaea9823..a5137bffd19 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -13002,15 +13002,7 @@ }, /area/centcom/control) "bHP" = ( -/obj/machinery/door/airlock/glass_mining{ - dir = 1; - name = "Operations Bay"; - req_one_access = list(26,29,31,48,67,70) - }, /obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -13020,6 +13012,11 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, +/obj/machinery/door/airlock/glass_mining{ + dir = 1; + name = "Operations Bay"; + req_one_access = list(26,29,31,48,67,70) + }, /turf/simulated/floor/tiled, /area/horizon/operations/office) "bHT" = ( @@ -25038,17 +25035,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - dir = 1; - name = "Operations Bay"; - req_one_access = list(26,29,31,48,67,70) - }, /obj/effect/map_effect/door_helper/unres{ dir = 1 }, /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_mining{ + dir = 1; + name = "Operations Bay"; + req_one_access = list(26,29,31,48,67,70) + }, /turf/simulated/floor/tiled/full, /area/horizon/operations/office) "dmJ" = ( @@ -34129,9 +34129,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -40396,9 +40393,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/primary/deck_3/port) "fpB" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -54646,9 +54640,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -86396,9 +86387,6 @@ "ltg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -107893,7 +107881,7 @@ dir = 5 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/horizon/operations/office) @@ -156566,9 +156554,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/horizon/operations/office) "uNZ" = ( @@ -179638,6 +179623,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/horizon/operations/office) "xQO" = (