mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-14 09:27:45 +01:00
An expansion for the boxing ring (not literally, it's still the same size) that adds punching bags and two new types of holodeck swords. (#20715)
Adds two kinds of swords intended for the holodeck. They are less sci-fi lightsaber than the Thunderdome energy swords, but like the Thunderdome swords, they only deal pain damage. You can use these two practice swords on Punching Bags. Two Punching Bags have been added to the (renamed) boxing ring, for when you want to warm up or practice alone. Renamed the Boxing Ring to the Sparring Ring, now that it can accommodate more than just boxing.
This commit is contained in:
@@ -1360,6 +1360,12 @@ GLOBAL_LIST_INIT_TYPED(total_extraction_beacons, /obj/structure/extraction_point
|
||||
flick("[icon_state]2", src)
|
||||
playsound(get_turf(src), /singleton/sound_category/swing_hit_sound, 25, 1, -1)
|
||||
|
||||
/obj/structure/punching_bag/attackby(obj/item/attacking_item, mob/user)
|
||||
if(istype(attacking_item, /obj/item/holo/practicesword))
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
flick("[icon_state]2", src)
|
||||
playsound(get_turf(src), 'sound/weapons/bladeparry.ogg', 25, 1, -1)
|
||||
|
||||
/obj/structure/weightlifter
|
||||
name = "weight machine"
|
||||
desc = "Just looking at this thing makes you feel tired."
|
||||
|
||||
Reference in New Issue
Block a user