diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1ed89d65183..62772ff986c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -16,6 +16,7 @@ * Action figures * Plushies * Toy cult sword + * Ring bell */ @@ -1037,6 +1038,24 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' +/obj/item/toy/ringbell + name = "ringside bell" + desc = "A bell used to signal the beginning and end of various ring sports." + desc_info = "Use help intent on the bell to signal the start of a contest\ndisarm intent to signal the end of a contest and\nharm intent to signal a disqualification." + icon_state = "ringbell" + anchored = TRUE + +/obj/item/toy/ringbell/attack_hand(mob/user) + switch(user.a_intent) + if (I_HELP) + user.visible_message(FONT_LARGE(SPAN_NOTICE("[user] rings \the [src], signalling the beginning of the contest.")), SPAN_NOTICE("You ring \the [src] to signal the beginning of the contest!")) + playsound(user.loc, 'sound/items/oneding.ogg', 60, 1) + if (I_DISARM) + user.visible_message(FONT_LARGE(SPAN_NOTICE("[user] rings \the [src] three times, signalling the end of the contest!")), SPAN_NOTICE("You ring \the [src] to signal the end of the contest!")) + playsound(user.loc, 'sound/items/threedings.ogg', 60, 1) + if (I_HURT) + user.visible_message(FONT_LARGE(SPAN_WARNING("[user] rings \the [src] repeatedly, signalling a disqualification!")), SPAN_WARNING("You ring \the [src] to signal a disqualification!")) + playsound(user.loc, 'sound/items/manydings.ogg', 60, 1) //baystation desk toys diff --git a/html/changelogs/RingBell.yml b/html/changelogs/RingBell.yml new file mode 100644 index 00000000000..c378849e35c --- /dev/null +++ b/html/changelogs/RingBell.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "The holodeck boxing simulation now has a ringside bell." \ No newline at end of file diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 96e738fb94e..7f75ce53e9e 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 788ce57d3a5..13831d95ab0 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -29103,6 +29103,12 @@ /obj/machinery/acting/changer, /turf/unsimulated/floor, /area/antag/mercenary) +"oFg" = ( +/obj/structure/table/holotable, +/obj/item/toy/ringbell, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "oGi" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 8 @@ -107035,7 +107041,7 @@ adx adx aeJ aeO -afj +oFg afk afJ afP diff --git a/sound/items/manydings.ogg b/sound/items/manydings.ogg new file mode 100644 index 00000000000..7fd7bacc94e Binary files /dev/null and b/sound/items/manydings.ogg differ diff --git a/sound/items/oneding.ogg b/sound/items/oneding.ogg new file mode 100644 index 00000000000..33526c080e5 Binary files /dev/null and b/sound/items/oneding.ogg differ diff --git a/sound/items/threedings.ogg b/sound/items/threedings.ogg new file mode 100644 index 00000000000..ebbffffd277 Binary files /dev/null and b/sound/items/threedings.ogg differ