mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Adds the ringbell and maps it into the boxing simulation (#11644)
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: TheGreyWolf
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "The holodeck boxing simulation now has a ringside bell."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 53 KiB |
@@ -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
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user