Skip to content

Add "Deck the Halls" by Kevin Macleod#2233

Merged
Colin-Tel merged 12 commits intoDeltaV-Station:masterfrom
Lyndomen:christmasops
Nov 19, 2024
Merged

Add "Deck the Halls" by Kevin Macleod#2233
Colin-Tel merged 12 commits intoDeltaV-Station:masterfrom
Lyndomen:christmasops

Conversation

@Lyndomen
Copy link
Copy Markdown
Contributor

@Lyndomen Lyndomen commented Nov 18, 2024

About the PR

Draft PR, I havent purchased a license yet or uploaded anything. Do we want it on the jukebox:trollface:

Why / Balance

what a banger

Technical details

yaml

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog
🆑

  • add: Added holiday cheer

@github-actions github-actions Bot added the Changes: YML Changes any yml files label Nov 18, 2024
@therealDLondon
Copy link
Copy Markdown
Contributor

If you're willing to pay the 200 bucks I am 100% on board

@MilonPL
Copy link
Copy Markdown
Contributor

MilonPL commented Nov 18, 2024

it would be REALLY funny

@Lyndomen
Copy link
Copy Markdown
Contributor Author

I am on record that I will pay $200

@Unkn0wnGh0st333
Copy link
Copy Markdown
Contributor

The peak in question

@therealDLondon
Copy link
Copy Markdown
Contributor

I am on record that I will pay $200

Then do it, im using my 1 "merge this" token, do it
Add it to the lobby, and the jukebox, also make it a nuke countdown song :trollface:

@dvir001
Copy link
Copy Markdown
Contributor

dvir001 commented Nov 18, 2024

image

@ThataKat
Copy link
Copy Markdown
Contributor

I would lose my shit if this was a nuke countdown song. Official opinion of Direction pending

@ThisIsIPat
Copy link
Copy Markdown

It could replace every single lobby song. That's the only song that plays.

@CybersunOperative
Copy link
Copy Markdown

hi official opinion of direction here (trust). If you can resolve the license, then by all means, add it to the jukebox. Might be funny, I would laugh.

@boogiebogus
Copy link
Copy Markdown
Contributor

can we add a rule to make people who play it valid

@IamVelcroboy
Copy link
Copy Markdown
Member

This is evil

@github-actions github-actions Bot added the Changes: Audio Changes any audio files label Nov 19, 2024
@Lyndomen
Copy link
Copy Markdown
Contributor Author

1984 so it turns out $200 is a scam or something and a real license for the OG shit would be thousands of dollars. i have a house to remodel so that aint it chief.

in return we get
image

deck the halls, royalty free and in public domain by kevin macleod king of all shitty youtube videos

im still looking into the legality of CC-BY covers, as someone is sharing a "All I want for christmas is you" cover as CC-BY but that might not be real, idk

@Colin-Tel
Copy link
Copy Markdown
Contributor

I dig it

@Lyndomen
Copy link
Copy Markdown
Contributor Author

oh real not draft

@Lyndomen Lyndomen marked this pull request as ready for review November 19, 2024 03:55
@Lyndomen Lyndomen requested a review from a team November 19, 2024 03:55
@Lyndomen Lyndomen changed the title Add "All I Want For Christmas Is You" by Mariah Carey Add "Deck the Halls" by Kevin Macleod Nov 19, 2024
@Colin-Tel Colin-Tel merged commit b05a292 into DeltaV-Station:master Nov 19, 2024
DisposableCrewmember42 pushed a commit to DisposableCrewmember42/Delta-v that referenced this pull request Nov 19, 2024
* meow

* meow

* meow

* meow

* meow

* meow

* meow

* meow
@Lyndomen Lyndomen deleted the christmasops branch November 20, 2024 20:35
sleepyyapril added a commit to Simple-Station/Einstein-Engines that referenced this pull request Feb 4, 2025
# Description

## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!**

Merges a lot of PRs from Delta-V, most of these are plain YML changes so
they shouldn't cause wizmerge-like issues.
- DeltaV-Station/Delta-v#1008 
- DeltaV-Station/Delta-v#1077
- DeltaV-Station/Delta-v#1092
- DeltaV-Station/Delta-v#1094
- DeltaV-Station/Delta-v#1143
  - Excluded the lobby art with DeltaV branding.
- DeltaV-Station/Delta-v#1176
- DeltaV-Station/Delta-v#1209
- DeltaV-Station/Delta-v#1227
- DeltaV-Station/Delta-v#1252
- not directly cherry-picked due to harpy singing now being stored in a
different file, but implemented the same thing in
df50140
- DeltaV-Station/Delta-v#1261
- DeltaV-Station/Delta-v#1271
- DeltaV-Station/Delta-v#1272
- Also made available to Humans and Tajarans like the other Felinid
tails.
- DeltaV-Station/Delta-v#1426
- DeltaV-Station/Delta-v#1462
- DeltaV-Station/Delta-v#1542
- DeltaV-Station/Delta-v#1759
- DeltaV-Station/Delta-v#1763
- DeltaV-Station/Delta-v#1765
- DeltaV-Station/Delta-v#1780
- DeltaV-Station/Delta-v#1781
- DeltaV-Station/Delta-v#1804
- DeltaV-Station/Delta-v#1814
- TODO in another pr, vulp sprite for the colorable neck gaiter (PR only
adds vulp states to pre-existing black/red neck gaiters)
- DeltaV-Station/Delta-v#1828
  - Added to Loadouts for Corpsman, costs 2 points.
- DeltaV-Station/Delta-v#1838
- DeltaV-Station/Delta-v#1877
- DeltaV-Station/Delta-v#1905
  - Added to Loadout Uniforms, costs 1 point. 
- DeltaV-Station/Delta-v#1910
- DeltaV-Station/Delta-v#1935
- DeltaV-Station/Delta-v#1946
- DeltaV-Station/Delta-v#1994
- DeltaV-Station/Delta-v#1997
- DeltaV-Station/Delta-v#1998
- DeltaV-Station/Delta-v#2031
- DeltaV-Station/Delta-v#2089
- DeltaV-Station/Delta-v#2113
- DeltaV-Station/Delta-v#2213
- DeltaV-Station/Delta-v#2209
- DeltaV-Station/Delta-v#2210
- Prerequisite Wizden PR added:
space-wizards/space-station-14#29243
- Prerequisite Wizden PR added:
space-wizards/space-station-14#30856
- DeltaV-Station/Delta-v#2233
- DeltaV-Station/Delta-v#2245
- DeltaV-Station/Delta-v#2250
- DeltaV-Station/Delta-v#2266
- DeltaV-Station/Delta-v#2267
- DeltaV-Station/Delta-v#2294
- DeltaV-Station/Delta-v#2307
- DeltaV-Station/Delta-v#2318
- DeltaV-Station/Delta-v#2398
- DeltaV-Station/Delta-v#2410
- DeltaV-Station/Delta-v#2462
- DeltaV-Station/Delta-v#2478
- DeltaV-Station/Delta-v#2501
- DeltaV-Station/Delta-v#2503
- DeltaV-Station/Delta-v#2504
- Prerequisite Wizden PR added:
space-wizards/space-station-14#30957
- DeltaV-Station/Delta-v#2524
- DeltaV-Station/Delta-v#2539
- DeltaV-Station/Delta-v#2635
- Prerequisite Wizden PR added:
space-wizards/space-station-14#32193
- Prerequisite Wizden PR added:
space-wizards/space-station-14#32327

## Changelog

Too much changes to count so some changes are unlisted

:cl: Several Contributors
- add: Added Lone Digger by Caravan Palace to the jukebox! (by MilonPL)
- add: Added Deck The Halls by Kevin Macleod to the jukebox! (by
Lyndomen)
- tweak: Now medical belts have a slot for medkits. (by Radezolid)
- add: Added a way for muskets, flintlocks, and musket cartridges (NOT
.60) to be crafted. (by Tryded)
- add: Added Vulpkanin-specific sprites to a lot of helmets and masks.
(by Adrian16199, TadJohnson00)
- add: Security dogs (such as Laika) now have Vulpkanin vocal emotes.
Howl! (by Remuchi)
- add: Split the Emag into the Cryptographic Sequencer and the Airlock
Access Override. (by Warmechanic)
- add: Added Corpsman Glasses, no more getting flashed as Corpsman! Also
available in Loadouts. (by Unkn0wnGh0st333)
- add: Harpies can now mimic harps! (by TheOneWhoIsManyFrame)
- tweak: Cats will now play with mouse toys. (by Deltanedas)
- add: Added a black turtleneck, available in Loadouts! (by Aikakakah)
- add: Added the Binary Translator Key to the uplink costing 1 TC and
the listening post operative headset. (by Radezolid)
- add: Spesos now have a new pretty look transferred from the Frontier
Station. (by whatston3)
- add: The home-run bat has been re-added to the traitor uplink.
- add: Added the CrystalThistle, mutated from the Galaxythistle that
generates Quartzite which when heated produces glass sheets. (by
jimmy12or)
- add: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy,
it hurts! (by jimmy12or)
- add: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper
that produced Ectoplasm. (by jimmy12or)
- add: Added blue and purple tomato soup, made using Blue Tomatoes. (by
DisposableCrewmember42)
- add: Added new drinks: the double ice cream (by dge21) and Dr. Gibb
Blood Red (by BlitzTheSquishy).
- add: Some drink reactions now require shaking with the shaker or
stirring with a spoon. (by Vermidia)
- add: Added "Selene" wing customization option for moths (by
boogiebogus)
- add: Added the tiger tail sprite for Felinids, Humans and Tajarans.
(by Adrian16199)
- add: NanoTrasen has established business relations with HydroCo! You
can now order powdered milk and juice via your Logistics department. (by
DisposableCrewmember42)
- tweak: Bar and kitchen shelves no longer restrict the items that can
be placed in them. (by Velcroboy)
- tweak: Bookshelves can now fit any kind of item, not just books. (by
Deltanedas)
- add: New magic crayons have appeared in the sector, artists rejoice!
(by AvalonProto)
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Feb 10, 2025
* meow

* meow

* meow

* meow

* meow

* meow

* meow

* meow
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Apr 17, 2025
Because people were making invisible ones

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# People were making invisible IPCs, Timfa suggested this

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Good soldiers follow orders and I won't allow IPCs to explot
invisibility lol.
---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Task
- [x] Completed Task

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->



# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Diggy
- add: People were using IPC markings to become invisible, now they can
only take doll joints markings in the overlay section.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Apr 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Audio Changes any audio files Changes: YML Changes any yml files

Projects

None yet

Development

Successfully merging this pull request may close these issues.