mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Merge pull request #49400 from plapatin/airpods
nanotrasen-brand spacepods can play music just like headphones now
This commit is contained in:
@@ -114,6 +114,16 @@
|
||||
icon_state = "[initial(icon_state)]"
|
||||
update_icon()
|
||||
|
||||
/obj/item/instrument/piano_synth/headphones/spacepods
|
||||
name = "nanotrasen space pods"
|
||||
desc = "Flex your money, AND ignore what everyone else says, all at once!"
|
||||
icon_state = "spacepods"
|
||||
item_state = "spacepods"
|
||||
slot_flags = ITEM_SLOT_EARS
|
||||
strip_delay = 100 //air pods don't fall out
|
||||
instrumentRange = 0 //you're paying for quality here
|
||||
custom_premium_price = 1800
|
||||
|
||||
/obj/item/instrument/banjo
|
||||
name = "banjo"
|
||||
desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings."
|
||||
|
||||
@@ -30,12 +30,3 @@
|
||||
/obj/item/clothing/ears/earmuffs/dropped(mob/user)
|
||||
. = ..()
|
||||
REMOVE_TRAIT(user, TRAIT_DEAF, CLOTHING_TRAIT)
|
||||
|
||||
/obj/item/clothing/ears/earmuffs/spacepods
|
||||
name = "nanotrasen space pods"
|
||||
desc = "Flex your money, AND ignore what everone else says, all at once!"
|
||||
icon = 'icons/obj/clothing/accessories.dmi'
|
||||
icon_state = "spacepods"
|
||||
item_state = "spacepods"
|
||||
strip_delay = 100 //air pods don't fall out
|
||||
custom_premium_price = 1800
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
/obj/item/clothing/under/pants/mustangjeans = 1,
|
||||
/obj/item/clothing/neck/necklace/dope = 3,
|
||||
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
|
||||
/obj/item/clothing/ears/earmuffs/spacepods = 1)
|
||||
/obj/item/instrument/piano_synth/headphones/spacepods = 1)
|
||||
refill_canister = /obj/item/vending_refill/clothing
|
||||
default_price = 60
|
||||
extra_price = 120
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 9.6 KiB |
Reference in New Issue
Block a user