Commit Graph

21366 Commits

Author SHA1 Message Date
feartheblackout
d0c79410a3 K'lax Vaurcae can take the Unathi straw hat + Mi'kuetz can take Wastelander gear from loadout (#19191)
title

Will probably need approval from @desvenlafaxine and/or @RustingWithYou.
2024-05-22 16:11:27 +00:00
Geeves
c2ae767e15 Character Preview Augments (#19196)
* Augments such as the Idris Faceplate are now visible in the character
preview screen.


![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/2d3ffadf-5754-488f-8b55-da191f6b67ba)
2024-05-22 16:11:22 +00:00
Sparky
8aec7b8e36 Smaller sip volumes. (#19180)
Allows drinks to select smaller transfer amounts, as low as 1 unit, to
allow smaller sips.
2024-05-22 09:10:38 +00:00
Sparky
5404c03a45 Alien Sleep Updates - Allows upright sleeping, and indefinite sleep. (#19178)
This allows certain alien species (Currently Vaurcae, IPCs and Dionae)
to sleep while standing, and gives them a verb to let them choose to
sleep indefinitely.

It also adds custom messages for enter sleep and examining, as well as
changing the snoring emote for the above aliens too.

---------

Signed-off-by: Sparky. <ben.polwart@gmail.com>
Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>
2024-05-22 09:10:16 +00:00
Sparky
7db6034c2d Snoods (#19176)
Adds snoods to the mask loadout.

Adhomai is returning and I couldn't help myself.

Images because I've learned my lesson


![image](https://github.com/Aurorastation/Aurora.3/assets/26849270/c8053cc8-b8b0-460a-8a13-f40f2460cb55)

![image](https://github.com/Aurorastation/Aurora.3/assets/26849270/e0c53593-d6bf-4937-8bb3-7162e0880016)

![image](https://github.com/Aurorastation/Aurora.3/assets/26849270/48498460-e07f-4d3e-82ac-b98357e3ed7e)

![image](https://github.com/Aurorastation/Aurora.3/assets/26849270/34ebc4b8-bc1b-4080-9176-954c9d689b68)
2024-05-22 09:10:06 +00:00
Cody Brittain
7abfb936cb Ported Supermatter improvements from Baystation (#19175)
- rscadd: "The supermatter reactor now produces radiation via
SSRadiation. Better wear your suit!"
- rscadd: "The supermatter reactor now has a ray effect and color shifts
if it is damaged."

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-22 09:09:43 +00:00
Sparky
32a63d39a8 Clip-On Radios (#19164)
Adds Clip-On Radios, which can be equipped to both ear or wrist slots,
always appearing on the body, clipped onto your uniform or jacket.
2024-05-22 09:09:35 +00:00
Cody Brittain
8ee205a7aa Add support for item tooltips and outlines (#19154)
This adds support for item tooltips and outlines, if the item in
question is in an inventory and not in storage:

![image](https://github.com/Aurorastation/Aurora.3/assets/1779662/25a027b1-f78b-434c-971e-acd27c98eb3c)

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-22 09:09:12 +00:00
Fluffy
77677c2a95 Fixed newline issue in custom item descriptions (#19134)
Fixed newline issue in custom item descriptions


![image](https://github.com/Aurorastation/Aurora.3/assets/65877598/35b208c6-18a7-46f5-97b4-feeef01e5993)

Fixes #19132
2024-05-19 20:19:41 +00:00
Acetrea
750a923087 Stok and Vxrexi Meat (#19185)
Changes stoks meat type to moghresian meat.
Fixes sprite issue with vaurca meat (bugmeat).
Adds sprite for moghresian meat.
2024-05-19 16:44:19 +00:00
Fluffy
3dc4cce9c2 Minor span refactoring (#19177)
Minor span refactoring
2024-05-19 16:37:29 +00:00
Crosarius
3120d2dda4 Chewing Koko (#19163)
Adds chewing koko, a chewable form of koko reeds available from smoking
vendors, and in the loadout.


![image](https://github.com/Aurorastation/Aurora.3/assets/30341877/ebddfe43-373b-4c37-9935-217e93fab710)
2024-05-19 16:25:28 +00:00
Clem-The-Duck
f715cb3707 Unathi military voidsuit fix (#19153)
Fixes [#19150](https://github.com/Aurorastation/Aurora.3/issues/19150)

they just needed contained_sprite = true
2024-05-15 22:03:41 +00:00
Llywelwyn
73fab5b9d3 Fixes PDA Chat Client not working properly after PDA loses charge (#19157)
fixes https://github.com/Aurorastation/Aurora.3/issues/19156

tl;dr: chat client is supposed to try turning the service back on
automatically when you open it, but it was only doing that if manually
disabled, which is a different state. this makes it do it if it's killed
(like via running out of charge) or disabled manually

- bugfix: "Fixed PDA Chat Client not working properly after a PDA loses
charge."
2024-05-15 17:10:15 +00:00
DreamySkrell
845759c427 Allows Vaurca FR to take mag-claws (#19136)
.

Co-authored-by: DreamySkrell <>
2024-05-15 17:10:00 +00:00
Crosarius
0af399e3f9 Moghresian Meat & Unathi Food Nutrition Improvement (#19135)
This PR creates a new subtype of meat, "moghresian meat", specific to
animals which are located in Uueoa-Esa.

It also adds "synthetic" blood to the biogenerator, for use in the many
recipes which require blood (I did this because it's actually impossible
to get blood from cows, chickens, etc - turns out you can't draw blood
frim simplemobs, and people have been either using their own blood, or
making monkey cubes and drawing blood from them, which is WEIRD.
Mechanically the "synthetic" blood is just generic blood. I have no idea
if vampires can abuse this, but it should be no different from them
making monkey cubes in the biogenerator and eating them, so... hopefully
that's ok?)

~I have also done a once-over on the reagent values of all the food in
the Unathi foods dm, and fixed the reagent value for them. Some foods
had far fewer reagents than their constituent ingredients, which
bothered me. I also fixed their flavours so you get nicer messages
instead of "some sort of protein"

I noticed that this food reagent issue is actually prevalent in ALL the
food .DMs. A good example of this is Black Eye Gumbo, which has no
reagents listed. It can be eaten in a single bite and tastes like
nothing, and cannot be ground. I think that some people have added foods
under the impression that the reagents of the ingredients are added by
the cooking process, when this doesn't actually seem to be the case. I
fixed this just for the Unathi foods, but I don't have the time to go
through them all.~

EDIT: Turns out the reagent thing was a red-herring caused by
adminspawning food. Fixed now!
2024-05-15 17:09:56 +00:00
Geeves
86d3b89a52 Simple Mob Notifications (#19102)
* Tweaked some messages to be based on time since last message, instead
of being based on probability. This includes low blood messages,
infected liver messages, fever messages, and some drug messages.
2024-05-15 17:09:49 +00:00
Crosarius
5c01dd9bcd Make it mechanically possible for tall people to "tower over" short people (#19107)
This is a simple value change that makes the "they are absolutely tiny
compared to you!" and "they tower over you!" messages appear at 50 cm
height difference, instead of 100 cm height difference.

This will make it mechanically possible to actually get these messages
outside of edge cases like Vaurca Bulwarks or Breeders or max-height
G2s. Now tall Unathi will be able to tower over shorter Humans, Skrell,
etc. Previously, this was impossible due to the difference between the
minimum heights for Skrell, Humans, etc and the maximum heights for
Unathi, etc being less than 100.
2024-05-15 17:09:41 +00:00
Cody Brittain
d95734c606 Emissives (#18895)
A significant amount of influence was taken from
https://github.com/Baystation12/Baystation12/pull/33255, however adapted
to Aurora. Key things to note is the port of the newer alpha settings
from /tg/, among other improvements.

The ancient holographic and screen overlay code has been purged. This is
now handled with emissives, while holograms are handled with filters as
well.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-12 20:51:45 +00:00
Matt Atlas
9fc414823e Fixes command announcement encoding. (#18997)
Also makes some inputs into tgui_inputs.

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-05-12 19:26:25 +00:00
MelNye
53f3be09e8 Makes Wounds Appear on the Health Doll (#19111)
Adds wound overlays to the health doll. Basically ports [what I did on
Baystation12](https://github.com/Baystation12/Baystation12/pull/33765)
in a roundabout way.

**Why?**
Personally, it felt pretty jarring _not_ having them. More broadly, it's
a nice indicator of how hurt your character is and makes the health doll
a little less misleading about how beat up you are (as it only displays
the level of pain a certain body part is in).

**Did you test this?**
I did. It works fine with Humans, Skrell, Machines, Unathi, Diona, and
Tajara. If there's species I missed, it shouldn't be too tricky to go
back and check those, too.

**Some examples**
Let's say you've been stabbed with a kitchen knife a few times. That
might look a bit like this.

![image](https://github.com/Aurorastation/Aurora.3/assets/77447558/aa0cef03-aba9-407b-8002-cba8856b5290)
And once it's bandaged, it'd look like this.

![image](https://github.com/Aurorastation/Aurora.3/assets/77447558/60da7c3b-100e-48f1-ac6e-7d8cb168390b)

Co-authored-by: Nyello <karljohanssonpublic@gmail.com>
2024-05-12 19:02:47 +00:00
naut
128c014e06 Aayun Kaiser's custom ESS rig (#19117)
Adds Aayun Kaiser (Lmwevil's character)'s custom item into the game: a
prototype ESS suit clad in black and purple. Comes with a nice built-in
scarf.

Additionally mods the stock offworlder ESS rig to be able to dispense
RMT.

See
https://forums.aurorastation.org/topic/20316-aayun-kaisers-prototype-scarab-ess/
for relevant canon app.


![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/4f4c7f15-90e8-4b7d-b822-d8a43f99b0f4)
![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/baecc922-4476-42eb-a8a7-9654d61e0e88)
![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/e37b8189-2b6b-420a-9b15-b125522dbffc)
![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/de84dffe-3c78-45d9-8367-33626903fb95)
2024-05-12 19:02:33 +00:00
4000daniel1
8c566ac48b Adds instruments to the loadout and also ports some TG in-hand sprites for them. (#18389)
Hopefully restricting them to off-duties and passengers will prevent
them from being all too overused (might'd be a bit weird to bring your
old guitar with you to work every single day).

---------

Signed-off-by: 4000daniel1 <95170823+4000daniel1@users.noreply.github.com>
2024-05-12 19:01:58 +00:00
Geeves
3920f83d0f Stairs are Dangerous (#9210)
* Crates, closets, rollerbeds and wheelchairs now cannot safely traverse
stairs.
2024-05-12 19:01:38 +00:00
Geeves
43cd06acf9 Ghost Role Accounts (#18004)
* The majority of ghost roles now spawn with an Idris account and some
funds.
2024-05-12 19:01:25 +00:00
lavillastrangiato
863cbab142 Minor Belt Buffs (#19112)
* Adds one extra slot to the xenoarchaeology belt, making it a nice
round number of ten.
* Adds investigation tools to the security belt, like cameras,
recorders, and clipboards. Also crowbars.
2024-05-12 18:56:19 +00:00
Fluffy
83891924ab Gas nades bounty fix (#19115)
DMDoc'd the vars of /datum/bounty/item.
All the two types of gas grenades are now allowed for the gas grenade
bounty.

Fixes #19064
2024-05-12 18:56:08 +00:00
feartheblackout
f5f7ea6d6e Changes "Void Hivenet User" to "Untether Hivenet User" (#19114)
Requested by @desvenlafaxine, as voiding is a separate act in Vaurca
society entirely.
2024-05-11 12:51:00 +00:00
Fluffy
8f705cb6b0 Ore satchel won't spam failed pickups anymore (#19133)
Ore satchel won't spam failed pickups anymore unless the user does an
explicit pickup request (clicking on a turf/item)

Fixes #18413
2024-05-11 12:50:34 +00:00
Jason
a4ffdb0856 Fix 9mm pistols becoming invisible (#19131)
Fix 9mm pistol becoming invisible when the magazine is removed.
2024-05-11 12:49:51 +00:00
RustingWithYou
4f7738f921 Uueoa-Esa, Part 6 - Ouerea (#19013)
Adds several ruins for the planet Ouerea.
2024-05-09 15:09:14 +00:00
Cody Brittain
c01768e45c Assisted organ sprites, and assisted brains (#19087)
This PR adds several sprites for assisted organs, which previously
lacked any sprites at all. In addition, this adds an assisted brain,
which is now available to pick in character creation. Long-term, I'd
like to look into adding assisted implants into the medical gameplay
loop, but for now these are character-creation only. "Mechanical"
prosthetic brains are not possible, and have been excised entirely.

### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/obj/organs/organs.dmi | Mechoid (Polaris) | CC-BY-SA |

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-09 15:08:00 +00:00
Jason
a3f3fa1a2f Allows ghosts to examine ore box contents (#19097)
Removes a check to see if the user is a human/robot mob, and allows
anyone to view the contents, still must be adjacent but that's not an
issue for ghosts
2024-05-09 15:06:57 +00:00
Fluffy
944bc50a7c Protolathe improvements (#19098)
Various DMdocs to the protolathe code.
Increased power draw of the protolathe.
Made the protolathe realtime-constant.
Adding materials to the protolathe now uses TGUI input.
Removed a basically useless processing, uses a timer / queue handler
proc now.
DMDoc'd other parts of the code, including corrections between ticks and
deciseconds.
2024-05-09 15:06:32 +00:00
Fluffy
08d32a23f9 Hopefully fix the engine sound volume for the last time (#19113)
Hopefully fix the engine sound volume for the last time
2024-05-09 15:05:40 +00:00
RustingWithYou
f3f802b372 Uueoa-Esa, Part 7 - The Wasteland (#19014)
Adds several ruins for the Wasteland.
2024-05-06 14:56:24 +00:00
Alberyk
70a70c460a Adhomai ruins and People's Station fix and tweaks (#19025)
-tweaks some of the adhomai's ruins zones and mapping to take into
consideration stuff like weather
-replaces the people's station windows with the newer ones
-expand the people's station hangar so the intrepid can land inside once
again
2024-05-06 03:41:17 +00:00
Crosarius
5eb6738fa7 Alcohol Intoxication Overhaul (#19062)
This PR will make broad changes to the way that alcohol/butanol
intoxication works in game, with the intention of making alcohol
consumption actually impactful, and last much longer than it currently
does. It also includes some quality of life changes to the way that
liver damage works, better indication of the player's level of
intoxication to better communicate when the player is getting **too**
drunk, and the frequency of vomiting. Players will **no longer** die
extremely fast from getting drunk, will be able to get drunk, and stay
drunk.

- The rate of liver alcohol filtration has been reduced to 0.015
intoxication every second. This calculates out to the elimination of
0.015 BAC (One standard drink) every ten minutes.
- New messages have been added to indicate when the player is drunker
than drunk.
- At 0.10 BAC the "You feel drunk!" message is replaced with the message
"You feel absolutely smashed!"
- At 0.15 BAC the "You feel drunk!" message is replaced with the message
"You feel the room spinning..."
- Liver damage no longer occurs when the player vomits from
intoxication, and instead occurs when the player blacks out or loses
consciousness (0.20 and 0.30 BAC, respectively)
- The liver will no longer regenerate BAC is above 0.20.
- The coefficient multiplier that Unathi metabolise butanol has been
buffed from 3 to 9 (They now metabolise butanol at roughly the same rate
that Humans metabolise Alcohol)

One thing of note is that these changes have indirectly fixed a "bug"
that was occurring for Unathi with Butanolic beverages; The liver was
filtering out intoxication faster than Unathi were able to metabolise
some lower strength butanolic drinks, making them unable to get drunk
from things like sarezhi wine. With the buff to intoxication, and the
reduction in liver filtration speed, butanol is going to be returned to
being very potent for Unathi (This seems to be the way it was originally
intended?) so Unathi players who are used to Butanol being quite useless
at intoxicating Unathi are going to need to be especially careful.

Also, I have done testing on my local test server, but to be frank the
tickrate of my test server is very fast, and I'm not entirely sure just
how well these changes will translate to a live environment with a
heavier server load and longer tick times.

---------

Signed-off-by: Crosarius <30341877+Crosarius@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2024-05-05 21:13:27 +00:00
tomixcomics
020acf3253 Foodsplosion (Adds many new food dishes and 1 new drink) (#19065)
Adds 14 new food dishes including
-pigs in a blanket
-alfajores
-grilled peppers
-meat stuffed peppers
-rice stuffed peppers
-peanut butter pita
-omelette pita
-paneer gadpathur
-konaqu
-schnitzel
-schnitzel pita
-cozmo cubes
-nakarka cheese
-nakarka burger

and 1 drink: ne'miik (which is vaurcan milk)

I suspect I mightve screwed something up while merging there are
supposed to be no changes to aurora.dmi so if anyone wants to help me
figure out how to undo that your help would be welcome!

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: Sparky. <ben.polwart@gmail.com>
2024-05-05 14:16:21 +00:00
Fluffy
3bbc802413 Gravity proc tweaks (#19047)
Tweaked gravity check proc to be more inline with TG's version.
Added signals for gravity check, that allows atoms to perform
anti-gravity.
Fixed roller beds thinking they have no gravity and thus not emitting
the rolling sound.

Fixes #19045
2024-05-05 14:10:49 +00:00
Llywelwyn
d6c24f11c4 Adds gradient style/colour selection to the appearance changer (#19020)
now the ghostspawner and augs and stuff can change gradient style/colour
too where applicable


![image](https://github.com/Aurorastation/Aurora.3/assets/82828093/3c6a7f54-3ec4-447d-a46d-c22ca9cc5a55)

changes:
- rscadd: "Added gradient style/colour selection to the appearance
changer."
- bugfix: "Fixed hair colour being unable to be the same as eye colour."
2024-05-05 14:08:09 +00:00
Alberyk
dd136a25ac Adhomai Soul Injection: radio and lobby music (#18966)
This pr adds some minor soulful additions to Adhomai, including radio,
lobby music, and custom survey results for the planets.
2024-05-05 13:58:48 +00:00
Geeves
521cc1a4ba Hemophilia Disability (#18948)
* Added hemophilia and major hemophilia to the disabilities list. The
former will cause wounds to bleed for twice as long, while the latter
will cause wounds to bleed forever.
2024-05-05 13:58:04 +00:00
juniper
0cf56bb126 adds some new coalition weapons (#18812)
![image](https://github.com/Aurorastation/Aurora.3/assets/70682905/55b43203-b627-49c2-af2d-db5bc6d87892)

Adds four new weapons from the United Syndicates and the Federal
Technocracy.

Himeo has received two new guns based on the plasma cutter; the Guthrie
assault blaster and the Sabo-Tabby heavy blaster pistol. Both use a
hydrogen cell 'magazine' to mimic the more advanced, more accurate
Zavodskoi blasters on the market.

Galatea, likewise, has received the O61-B laser rifle pack set, an
export model of their own O61 Infantry Laser Rifle, and a gauss 'nitro
express' rifle, which fires tungsten slugs. Attempting to fire the O61
without a Galatean implant will result in consequences.

All sprites are my own handiwork, and all credit for the laser pack goes
to Alberyk for his work on the gatling gun. Matt and Schwann also
provided a great deal of help.
2024-05-05 13:56:57 +00:00
naut
6c079c4e1b Sensor relay refit (#19021)
Overhauls the sensor relay away site to be up to modern standards. It's
now more practical, more decrepit, and has more facilities for things
while retaining the old loot and goodies it had before.

The place starts depowered, save for the airlocks, which are powered by
default to allow entry without having to bust down a
window/wall/inflatable and vent the place.

In addition this PR adds a special sprite for the sensor array the relay
uses, and tweaks its stats:
* Now has a maximum range of 24.
* Has a stable range of 10.
* Cannot deep scan at all.
* Overheats very quickly at high ranges.
* Detects passing ships slower than a standard relay.

The above should make it more worthwhile to capture and use, as when
datalinked it provides visibility of a large portion of the sector.


![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/e53fd13e-ca7c-402e-9605-c213f729df7d)


![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/8d09db8e-b688-4dca-84b1-2945dc70f702)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/9e644f4c-1cf4-4fbc-8119-1cbfbba59a15)

# Before powering

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/156b61bd-eb7b-4cfc-8eca-5a752c4c4bea)

# After powering
<details><summary>Click to expand</summary>
<p>


![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/357f01fc-c0ce-46ca-9869-3ec4bdd6a14e)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/b3f74c29-14ad-4765-94b8-81b0591e5916)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/d155dd5f-69ff-4171-a0e0-ac871cff3415)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/e1db7407-8e7a-4c54-bfe4-0103000fc317)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/ffb63725-a34f-4743-a82c-c780a11421c0)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/59aeedae-7d3c-458b-bea5-5fe8cc94ebf0)

![image](https://github.com/Aurorastation/Aurora.3/assets/55491249/10f2cfba-fb80-4f2e-b8e4-d74a95f6830c)

</p>
</details>
2024-05-05 01:16:24 +00:00
holly
860e2bfe99 Daiquiri Fix (#19076)
Daiquiris accidentally had the same description and flavor as blue
curacao. This fixes that.

---------

Signed-off-by: holly <theholliedhock@gmail.com>
2024-05-03 18:31:36 +00:00
naut
80d79a585c Consolidates text files into their own, central folder (#19063)
Sorts the various .TXTs of the game (currently so far the lore radio
stations as well as the "verse books" (Biesel constitution, religious
scriptures, etc)) to a master `texts` file in Aurora's root directory.
Should help with config issues as well as consolidate all the texts in
one place, especially for use in future endeavors where bits of text
like these need to be made.

Should theoretically fix #19060. If it doesn't then, well, I'm stumped.
2024-05-02 16:42:57 +00:00
Geeves
68e1eb504e New Hair Gradient, Short Highlights (#19036)
* Added a new type of hair gradient, short highlights, suited to shorter
hairstyles. There are upshifted and downshift variants to cater for
different lengths of hair.

Standard

![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/fff2ade2-df0c-49c9-830d-3dd3ba369492)

![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/19367abe-59c0-464f-a898-ab8063ba8242)

Downshifted

![image](https://github.com/Aurorastation/Aurora.3/assets/22774890/82150b61-5e45-42fa-a013-cb79daaf6bc9)
2024-05-01 23:06:14 +00:00
DreamySkrell
7d67044010 More muffins (#19038)
momev update


![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/392b224f-1d47-4f61-85cb-77c2c94d33a1)

momev update

---------

Co-authored-by: DreamySkrell <>
2024-05-01 22:36:14 +00:00
Ben
47ae292bac Merchant Traders now have greetings for Species + Biases (#18825)
Traders used to only do greetings based on each subspecies, due to
significant overlap for some (ie, IPCs), functionality added for traders
to greet based on general species, if a specific subspecies is not
found.

Adds new defines for each species that is a list that has all subspecies
for them (ALL_IPC covers all frames for examples)

Biases for Species
DENY: "No service for Bots here"
UPCHARGE: Service, but prices higher
DISCOUNT: Special prrrices forrr comrrrades

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-05-01 22:35:49 +00:00