diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 87b48c60988..6e57504e6de 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -12,6 +12,12 @@ layer = ABOVE_WINDOW_LAYER w_class = WEIGHT_CLASS_NORMAL obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED + /// Sign type path that'll be spawned in `unfasten()` act. + var/sign_type = /obj/item/sign + +/obj/structure/sign/disassembly_hints(mob/user, distance, is_adjacent) + . += ..() + . += "You can use a screwdriver to fasten/unfasten \the [src]." /obj/structure/sign/ex_act(severity) qdel(src) @@ -25,7 +31,7 @@ /obj/structure/sign/proc/unfasten(mob/user) user.visible_message(SPAN_NOTICE("\The [user] unfastens \the [src]."), SPAN_NOTICE("You unfasten \the [src].")) - var/obj/item/sign/S = new(src.loc) + var/obj/item/sign/S = new sign_type(get_turf(src)) S.name = name S.desc = desc S.icon_state = icon_state @@ -39,6 +45,14 @@ w_class = WEIGHT_CLASS_HUGE var/sign_state = "" +/obj/item/sign/heavy + throw_speed = 3 + throw_range = 3 + force = 10 + throwforce = 10 + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' + /obj/item/sign/attackby(obj/item/attacking_item, mob/user) // Construction. if(attacking_item.isscrewdriver() && isturf(user.loc)) var/direction = tgui_input_list(user, "In which direction?", "Select Direction", list("North", "East", "South", "West", "Cancel")) @@ -59,6 +73,7 @@ S.name = name S.desc = desc S.icon_state = sign_state + S.sign_type = src.type to_chat(user, "You fasten \the [S] with your [attacking_item].") qdel(src) else ..() @@ -635,3 +650,34 @@ door to the tent with her body as the insurgents attempted to shoot through it. While she ultimately perished to gunfire, her sacrifice allowed the medical tent to be evacuated and let \ the 23rd capture all insurgents involved in the attack. Formerly a frontierswoman with no nation to call her own, she was buried with military honors and became the first Holy Martyr of \ Sun Reach in 2426. She is commonly venerated on Sun Reach and by Ma’zals throughout the Empire." + +/obj/structure/sign/floor_plaque + name = "plaque" + desc = "An adorned and polished bronze plaque, gleaming with first-class elegance." + icon_state = "plaque" + layer = DECAL_LAYER + sign_type = /obj/item/sign/heavy + +/obj/structure/sign/floor_plaque/horizon/captain_office + name = "Commemorative SCC Plaque" + desc = "The Stellar Corporate Conglomerate's logo is engraved in its bronze surface." + desc_extended = "The unbreakable chainlink, the one thing holding the Orion Spur together..." + +/obj/structure/sign/floor_plaque/horizon/service + name = "SCCV Horizon plaque" + desc = "A plaque commemorating the SCCV Horizon's launch by the unbreakable chainlink, the SCC. The one thing holding the Orion Spur together. According to some, anyways." + +/obj/structure/sign/floor_plaque/raskara_okon + name = "Okon 001 Plaque" + desc = "Granted as a gift to honor the Hadiist-Skrell relationship. Okon 001 will be the Party's eyes upon Adhomai." + +/obj/structure/sign/floor_plaque/halloween_event/entrance + name = "Fancy Plaque" + desc = "Welcome to the Infinity Reach Towers!" + desc_extended = "Welcome to the Infinity Reach Towers, a jewel of Nouvelle-Rochelle. We have several attractions here setup just for you! A haunted house, the renowned Ethereal Nexus Lounge, \ + and so much more! Have a wonderful stay, and remember.. Happy Halloween!" + +/obj/structure/sign/floor_plaque/halloween_event/bridge + name = "Fancy Plaque" + desc = "Infinity Bridge." + desc_extended = "You're currently standing on the Infinity Bridge. This bridge is over 150 floors high!" diff --git a/code/game/turfs/flooring/flooring_decals_.dm b/code/game/turfs/flooring/flooring_decals_.dm index 46997d7298e..d2ff694370b 100644 --- a/code/game/turfs/flooring/flooring_decals_.dm +++ b/code/game/turfs/flooring/flooring_decals_.dm @@ -765,11 +765,6 @@ /obj/effect/floor_decal/spline/fancy/wood/full icon_state = "spline_fancy_full" -/obj/effect/floor_decal/plaque - name = "plaque" - icon_state = "plaque" - outline = FALSE - /obj/effect/floor_decal/carpet name = "carpet" icon = 'icons/turf/flooring/carpet.dmi' diff --git a/html/changelogs/kano-dot-plaque-fix.yml b/html/changelogs/kano-dot-plaque-fix.yml new file mode 100644 index 00000000000..c87352687da --- /dev/null +++ b/html/changelogs/kano-dot-plaque-fix.yml @@ -0,0 +1,6 @@ +author: Kano + +delete-after: True + +changes: + - qol: "Floor plaques can now be examined and interacted such as signs." diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index c08cea31588..095c3d5c632 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ diff --git a/icons/turf/decals/decals.dmi b/icons/turf/decals/decals.dmi index cb29f13dcbc..1697f63896e 100644 Binary files a/icons/turf/decals/decals.dmi and b/icons/turf/decals/decals.dmi differ diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 1816792d6ca..e95d5adf2d3 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -2455,7 +2455,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "lt" = ( -/obj/effect/floor_decal/plaque, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2463,6 +2462,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/floor_plaque, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index 78de022b447..c6f26133ef2 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -3505,11 +3505,7 @@ /turf/simulated/wall, /area/city/nouvelle) "oN" = ( -/obj/effect/floor_decal/plaque{ - name = "Fancy Plaque"; - desc = "Infinity Bridge"; - desc_extended = "You're currently standing on the Infinity Bridge. This bridge is over 150 floors high!" - }, +/obj/structure/sign/floor_plaque/halloween_event/bridge, /turf/simulated/floor/tiled, /area/city/outside) "oP" = ( @@ -8258,11 +8254,7 @@ /turf/simulated/floor/carpet/rubber, /area/city/dining) "GV" = ( -/obj/effect/floor_decal/plaque{ - name = "Fancy Plaque"; - desc = "Welcome to the Infinity Reach Towers "; - desc_extended = "Welcome to the Infinity Reach Towers, a jewel of Nouvelle-Rochelle. We have several attractions here setup just for you! A haunted house, the renowned Ethereal Nexus Lounge, and so much more! Have a wonderful stay, and remember.. Happy Halloween!" - }, +/obj/structure/sign/floor_plaque/halloween_event/entrance, /turf/simulated/floor/tiled/dark/full, /area/city/port) "GX" = ( diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index 0d77697f45b..2832de25b6d 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -544,10 +544,7 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/effect/floor_decal/plaque{ - name = "Okon 001 Plaque"; - desc = "Granted as a gift to honor the Hadiist-Skrell relationship. Okon 001 will be the Party's eyes upon Adhomai." - }, +/obj/structure/sign/floor_plaque/raskara_okon, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 2ed01d891c8..29d9ed56833 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -5973,13 +5973,9 @@ }, /area/centcom/distress_prep) "aNY" = ( -/obj/effect/floor_decal/plaque{ - desc = "The Stellar Corporate Conglomerate Logo Engraved in bronze."; - desc_extended = "The unbreakable chainlink, the one thing holding the Orion Spur together..."; - name = "Commemorative SCC Plaque" - }, /obj/effect/floor_decal/spline/fancy/wood/full, /mob/living/simple_animal/corgi/fox/Chauncey, +/obj/structure/sign/floor_plaque/horizon/captain_office, /turf/simulated/floor/wood, /area/horizon/command/heads/captain) "aOa" = ( @@ -85899,11 +85895,8 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "mfj" = ( -/obj/effect/floor_decal/plaque{ - desc = "A plaque commemorating the SCCV Horizon's launch by the unbreakable chainlink, the SCC. The one thing holding the Orion Spur together. According to some, anyways."; - name = "\improper SCCV Horizon plaque" - }, /obj/effect/floor_decal/spline/fancy/wood/full, +/obj/structure/sign/floor_plaque/horizon/service, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "mfl" = (