Commit Graph

8571 Commits

Author SHA1 Message Date
beepbopbeepbop
b7849ebd15 OM Office Remap (#20935)
partly continues the work in my merge conflict ridden offices remap, but
just for the OM this time around.


![image](https://github.com/user-attachments/assets/ba5ed18c-c4f2-42fe-a946-e5408150f238)
2025-07-10 21:40:13 +00:00
naut
61d613a608 Adds the Expeditionary radio frequency as a default channel (#20948)
- Added the Expeditionary radio frequency to all radios that come with
Common (and Entertainment) frequencies as a default radio channel.
- The Expeditionary radio channel is now accessible in-radio via the
shortcut key 'D', e.g. `:d` or `.d`.
- Expeditionary radio channel changed to custard yellow for easier
visibility.

Should make expeditions (and Odysseys) a whole lot easier by allowing
everyone to access the Expeditionary channel in their headset, no radio
or frequency tweaking necessary.

Color was also changed to a sort of custard yellow, since its old color
was very hard to see for a lot of people.


![image](https://github.com/user-attachments/assets/1e9b3da1-c9d9-4073-9072-d2b41b55388b)

![image](https://github.com/user-attachments/assets/6b2e454d-aa88-4c44-8bae-4bcd635152e0)

![image](https://github.com/user-attachments/assets/b1f52ef6-7525-405f-a8f6-aa9809bdbee7)

![image](https://github.com/user-attachments/assets/31e6a423-4842-43e9-9179-196168146168)

![image](https://github.com/user-attachments/assets/5be773aa-36ac-4de8-bb94-f9cca5a27ccd)
2025-07-10 21:37:30 +00:00
Wowzewow (Wezzy)
9a6d9968dc 7/7 Bugfixes (#20969)
Fixes #20958
Fixes #20949
Fixes #20916
Fixes #20556
Fixes #20692
Fixes #20553
Fixes #20488
Fixes #20618
2025-07-10 21:37:16 +00:00
Kano
fb2c82a7af Banner fixes (#20931)
## About PR

- Uses `locate()` instead of `get_step()` when determining banner's
location, while considering the set offset value (normally either 32 or
-32) to have an accurate result. This resolves banners having stands
while placed on walls after Init.

- Instead of checking where the user is standing, the banners now checks
the position it'll be placed upon, and whether this position has dense
objects except the ones that is fine to be placed upon. Resolves #18068

- Prevents banner duplication, resolves #18620

I am sorry for the shitcode in advance

---------

Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2025-07-08 23:16:48 +00:00
Batrachophreno
9fba0357b5 Multiple href fixes (#20967)
Fixes a whole bunch of stuff caused by unclosed hrefs, details in
changelogs

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
2025-07-08 23:14:59 +00:00
Matt Atlas
1738301ea7 Ports CM's langchat to replace floating chat. (#20818)
Works generally better and will allow for better customization and emote
display.

---------

Co-authored-by: realmattatlas <liermattia@gmail.com>
2025-07-07 23:55:26 +00:00
ASmallCuteCat
cb05424e25 Adds the ability to wash kitchenware and glassware. No actual mechanical effects. (#20922)
This PR gives you the ability to wash glassware (glasses, mugs, beakers,
vials, etc) and kitchenware (pots and pans) at the sink.

With the empty item in hand, left-click a sink on DISARM intent.

There are no mechanical or gameplay changes. Items don't get dirty, you
aren't required to wash anything after use, it's just a little text-only
interaction meant for roleplay and nothing more. However, there's
nothing stopping the Executive Officer from giving you the stink-eye if
you don't wash the trays before putting them away!

---------

Signed-off-by: ASmallCuteCat <neofelisnebulosa128@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2025-07-06 21:47:23 +00:00
SleepyGemmy
727c37fa82 Wallet and Lanyard Fixes (#20929)
this PR fixes wallets and lanyards having a stray mob overlay and cleans
up the code a bit.

tested and made sure that ID cards still appear when worn by themselves
and that lanyards still appear with or without an ID card inside.

fixes #18678. fixes #20926.
2025-07-03 10:52:20 +00:00
Stev-the-third
b52a5c8e49 Himeo Ship (#20835)
Adds a Himean Patrol Corvette, along with all of its associated
features. Also adds the Nephilim blaster repeater cannon.

D1

![image](https://github.com/user-attachments/assets/b1693a9f-e095-4cf0-b2f8-4c53f0c3698d)
D2

![image](https://github.com/user-attachments/assets/4521c1fe-d542-411b-bc15-e332ab34fa97)
Submaps

![image](https://github.com/user-attachments/assets/0d8e290d-cd09-43d1-9d58-3027871cdc7c)


- [x] Fix the merge conflict
- [x] Role descriptions
- [x] Remember to delete the gold marker tiles
- [x] Door names
- [x] Deck 2 Atmos

---------

Co-authored-by: steviii <cormallenfield123@gmail.com>
2025-07-01 15:51:52 +00:00
SleepyGemmy
f926ce1ce4 Small Medical Sign (#20902)
this PR adds a small medical sign and maps it in.

### before

![image](https://github.com/user-attachments/assets/b76c0e6a-d8c8-468b-866d-4b077b76605e)

### after

![image](https://github.com/user-attachments/assets/33fd8d34-e6b8-443c-a878-dc46fd11ce10)
2025-07-01 15:50:48 +00:00
Kano
09f7ac5e39 Remaps Intrepid and ports CM's double seats (#20809)
## About PR

- Introduces a dropship-esque Intrepid, making it feel more like a
public transport in a overpopulous city, while trying to avoid
chokepoints.

- Ports the CM's double seats.

- Removes access restriction from Intrepid's side airlocks, to be in par
with the main airlock.

- Deletes some rogue pipes near hangar bay.

- Re-adds a small oven which was introduced in #16449. With slight
tweaks and different colour palette.

This is probably an awful way to port CM's vehicle seats, but in testing
only issue I've found is: when the chair occupant punches someone, their
own buckle off-set will get reset. I am not sure why.

The way the double seats work is, it'll let anyone pass through as long
as both of the seats aren't occupied at the same time.

## Images

<details><summary>Details</summary>
<p>


![a](https://github.com/user-attachments/assets/19813e63-a773-46a7-9f2c-43b5a23906ab)


</p>
</details>

---------

Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
2025-06-30 18:05:45 +00:00
Batrachophreno
27b5079066 Stock parts power usage and examine handling (#20892)
In preparation for future development, both A.) increased the power draw
of upgraded machines in more predictable ways and B.) reformated Examine
text output to handle displaying machines' upgradeable parts and what
they do in a more user-friendly way.

A.) is important because it opens the door to adding upgrade components
available for more machines.

B.) is important because not only do we need to communicate those sorts
of mechanics in a clean, clear, consistent way, but it also opens the
doors to being able to communicate more types of interaction mechanics
similarly well (such as assembly/disassembly tips).

Examples of new Examine boxes:
![Screenshot 2025-06-26
102050](https://github.com/user-attachments/assets/d7aa8b4c-b35f-4477-a1a2-b2846e92e06c)
![Screenshot 2025-06-26
102140](https://github.com/user-attachments/assets/0abb0a4c-a373-4427-af47-cadd192dfdc7)
![Screenshot 2025-06-26
102109](https://github.com/user-attachments/assets/886e4298-8a60-4cbb-be69-3de4cc8254d5)
![Screenshot 2025-06-26
102030](https://github.com/user-attachments/assets/5752da8c-b567-4337-94d4-b2ac2ca7ac36)

Note- while updating, made get_examine_text() also give Antagonism text
boxes to ghosts and storytellers, not just active Antags. This seemed
like a no-brainer thing but can be split into a separate PR if
requested.

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2025-06-30 18:02:57 +00:00
Batrachophreno
3f957304cb Add missing Fuel and Aux pipe types to RFD-P (#20893)
As title. The options were all defined, just definitions were missing
from the mode list.
2025-06-29 11:14:29 +00:00
Batrachophreno
bab2ac16f3 Misc TGUI updates (#20880)
Re-submitted version of #20867, saving the weirder Omni Filter rework
for another PR.

Migrates the menus for both the Space Heater (Temp Control Unit) and the
Gas Tank Dispenser to TGUI, makes them prettier. Just getting to grips
with how to build those menus, adding this to my collection of Things
Chipped Away At.

Before and after pics for comparison:

![space_heater](https://github.com/user-attachments/assets/d8517ea7-5c28-4e96-91ca-8f960fad73ca)

![gas_tank_storage_unit](https://github.com/user-attachments/assets/877208b8-6795-46b7-be14-229a98bdede7)

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2025-06-29 11:13:58 +00:00
SleepyGemmy
ea2a6b1204 Typos and Cigarette Fixes (#20878)
this PR fixes some typos and increases the S'rendarr's Hand content in
the adhomian cigarette from 5 to 10 to match the total amount found in
other cigarettes. also removes "vanilla cigarettes" from the code
because it isn't used anywhere.
2025-06-25 21:10:02 +00:00
SleepyGemmy
5f9201fdf0 Transferred Typo Fixes (#20879)
this PR fixes transferred being spelled as "transfered".
2025-06-25 21:10:01 +00:00
Stev-the-third
2667670749 New Wetsuits for Skrell (#20870)
Art by spookywastaken in Discord/Spookypineapple in Byond. Approved and
requested by Skrell Lore.


![Export](https://github.com/user-attachments/assets/f19c2eed-0ef2-4c6c-bb44-1655fb540653)

---------

Co-authored-by: steviii <cormallenfield123@gmail.com>
2025-06-25 21:09:59 +00:00
SleepyGemmy
6efd5540b9 First-aid Kit Define (#20874)
this PR changes the first-aid kit to use a define in the code. no player
facing changes.
2025-06-23 16:31:45 +00:00
FlamingLily
db1ed482fc Nerfs stinger grenades by about 50% (#20864)
Stingers are, in my opinion, one of if not the single most lethal
grenade type in our codebase.
They are a LTL option.
Considering they're also standard armoury equiment, I think it's fair to
bring them down a little. Hopefully they'll see more use.
2025-06-23 16:27:24 +00:00
Batrachophreno
3e8e76b464 Improve usefulness of Custodial Supplies Locator app (#20814)
Currently, the Custodial Supplies Locator app provided X and Y coords of
every single mop, bucket, janicart, and cleanbot on the entire server.

This PR makes it so that these objects will only be registered to the
global list of custodial supplies if they are present on the Horizon on
init, and it will also provide Z coords so you can tell if they're on a
different deck.

The app also has a weird built-in GPS function that tracks the reader's
movements instead of the device's. Instead of fixing this to follow the
device, I just removed GPS feedback text- a Janitor can grab one of the
GPS units that comes in their lockers, and this also allows them to be
tracked by other units.
2025-06-22 18:09:07 +00:00
hazelrat
3198e4e9ea Additional hydroponics QoL + additions (#20836)
This implements a bunch of little QoL improvements and a few substantial
expansions in hydroponics intended to deepen the job's interactions with
hydroponics mechanics.

- Adds k'ois spores to hydroponics! Note these are only available in
hydroponics proper, the seed storage machine for the garden has been
split into a separate subtype that does not contain k'ois. This is
packaged with a small hazardous containment chamber to safely grow
dangerous crops, in addition to a decontamination area and a hazmat
closet. K'ois is something the kitchen is continually in demand of, and
it is the sole foodstuff of an entire species - I don't see why
hydroponics wouldn't be able to grow it.
- D1 hydroponics now has the same atmos equipment for changing the
temperature of trays as xenobotany, allowing you to take air from distro
and change its temperature across two separate reservoirs feeding into
trays. Different crops grow optimally at different temperatures, this
lets hydroponicists engage with this mechanic.
- A bunch of misc code QoL changes, including shifting the crates in
hydroponics from mapping to code.
- Makes empty first-aid kits spawn with a minimum of 16 storage space.
Previously, the storage you'd see in empty first aid kits was well, well
below how much actual first-aid kits with prefilled contents had.
- Expanded hydroponicist maintenance access a little, so they can now
access the garden and hangars through adjacent maints.
- Seed storage machines have cranberry seeds now.
- A few more items are in the biogenerator, in the interest of making
the hydroponicist a better generalist.
- Shifted around some of the contents of the biogenerator to prioritise
more important stuff, including moving flags to the bottom of the list.
The only item actually removed is the money bag - I'm not sure what use
you'd find for that.
- Adds autoinjectors and autoinhalers to the hydroponicist's herbalism
crate.


![image](https://github.com/user-attachments/assets/fdac2923-b112-4e9d-b9f3-dbab125d7382)


![image](https://github.com/user-attachments/assets/f04a2480-7643-4d49-a46f-610f8495e691)
2025-06-22 18:08:56 +00:00
hazelrat
6bf9e31542 Makes fake objects click-able (#20849)
Effects were made transparent at parent a while ago, iirc. This re-adds
being clickable to fake objects, so you can see their names and
descriptions again.
2025-06-22 18:08:44 +00:00
Greenjoe12345
a18cccdbcc Forearm crutches + Pair of crutches in loadout (#20863)
Adds a forearm crutch to the game, as well as the ability to select a
pair of crutches in the loadout.
The sprites for it are made by Plyushsune, and altered by me.
2025-06-22 18:06:47 +00:00
ike709
3d568c173b Rename vars that override internal vars (#20837)
## About The Pull Request

OpenDream is adding `usr` and `args` to the `SoftReservedKeyword`
pragma: https://github.com/OpenDreamProject/OpenDream/pull/2307

This PR renames `var/usr` to `var/user` and `var/args` to
`var/arguments`.

## Why It's Good For The Game

This pragma is currently set as an error on Aurora, because using
internal var names for declared var names is cringe.
2025-06-19 10:48:06 +00:00
Matt Atlas
3837112bd1 Revert "Fix missing pixels in new hairstyle" (#20854)
bad merge
2025-06-17 02:33:31 +02:00
Evandorf
4e931c0f9c Fixes Decomposed Remains Interaction (#20848)
Fixed cleanable remains not being able to be clicked, hindering the
cleaning process. Clicking on certain decomposed remains (rats, lizards,
ect) will cause them to crumble into a cleanable form.


![image](https://github.com/user-attachments/assets/49556c7b-39b0-4d08-9b97-eedbde81f8b1)
2025-06-16 22:17:04 +00:00
Batrachophreno
156620ad4f Fix missing pixels in new hairstyle (#20828)
See title- the new haircuts leave two pixels of the head uncovered, this
fixes that. My bad, know better testing now... :(
2025-06-16 22:16:59 +00:00
hazelrat
ca9e7742aa Fixes the rolling fog effect (#20820)
Separates the rolling fog effect into its own type rather than relying
on varedits, shifts it up a few layers so it renders ingame. Currently,
it doesn't appear at all in the holodeck settings it's used in.
2025-06-11 09:57:18 +00:00
FlamingLily
04cd449bd7 Partially reverts the scarcity PR with respect to the bar. (#20788)
From the feedback I've been seeing while playing, the bar has become
*unfun* to play or to interact with. I don't think the scarcity PR has
helped improve player experience, at least for the bar. I've re-added
the drinks that were removed, including the cabinet of beer yokes in the
back.

HOWEVER. There are less of all of them, encouraging resupplies if
there's heavy use.

!!!! I have not touched any other changes the scarcity PR introduced.
Medbay and Engineering scarcity remain. Anything added to cargo remains
purchasable, and the lavatory vendor still exists. !!!!

Supersedes #20786
2025-06-11 09:55:51 +00:00
Cody Brittain
0782d0f29c Balloon alert improvements (#20798)
Updated balloon alerts with the latest changes from tgstation.
Improvements include a new plane for them, and their duration changes
depending on their length.

Unfortunately, since they were added, they have been abused for really
long text that is difficult to parse in-game (by myself included).
Balloon alerts are useful, but they are not smoking guns and have
limitations due to their lack of persistence. I have clamped down on
their abuse in favor of the standard established by tgstation, [seen
here](https://hackmd.io/0Cvr4hpcTe-KI6SbgfUWtw#balloon_alertballoon_alert_to_viewers).
We lack updated runechat so I will not propose this be a fully
implemented standard at this time, but I have cut down all existing
balloon alerts to size.
2025-06-11 09:52:13 +00:00
hazelrat
e441324abc Hydroponics fixes and additions (#20792)
Adds a few new recipes to the biogenerator in the interest of making the
hydroponicist more useful, including synthetic blood which I didn't
notice had been removed until now.

Fixes broken handheld icons for horticultural magazines, and introduces
a simple set of handhelds for them.

Fixes dyn cartons being invisible out of the Condimaster.

Adds sounds for watering, weeding, and sampling hydroponics trays, in
addition to a one second timer for weeding and sampling specifically.
Intended to add more feedback to hydroponics work - right now it's very
mute and lacking in visible messages.

Adds a new functionality to hatchets! They can now uproot plants,
killing them instantly, on a two second timer. This is to avoid the
tedious and arthritis inducing process of clicking on a single tray
several times to kill one plant.

Transitioned some tray documentation to DMDocs.
2025-06-06 15:08:20 +00:00
Wowzewow (Wezzy)
a0445aa04e Food Cart (#20544)
- rscadd: "Adds a new food cart to the kitchen."
- bugfix: "Fixes grill and oven to play their loop sounds only when
turned on."
- bugfix: "Fixes update_icon() of grill and oven so they actually look
turned on when turned on."
  - 
<img width="708" alt="dreamseeker_XCNVO4o3GC"
src="https://github.com/user-attachments/assets/081a8d8b-5fb6-40e2-adf8-05ffad91432b"
/>

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
2025-06-01 10:59:43 +00:00
Wowzewow (Wezzy)
d9bf7b0d6a Produce Box Rebalance (#20783)
Removes the fruits from taking up valuable space in the produce boxes.
Pastries and cakes are pretty much a luxury item for the most part - and
it isn't too hard to grow them in the minor amounts that they're
actually needed in recipes.

Moves rice from the produce box to just normal-ass bags beside flour.
They're basically as important as flour at this point.
2025-06-01 10:56:41 +00:00
FlamingLily
46546eb70f Expands the medbay recovery ward and adds a cryo pod and a spawn point. (#20772)
Off-duty crew and passengers can now spawn in the medbay recovery room,
for that sweet, sweet medical RP.

Vastly expanded the medbay recovery ward, including:
- Cryo pod (duh)
- Nav terminal, to watch the ship fly as the days crawl by
- Sink and hygiene vendor
- dining/general purpose rec table with uno
- MRE vendor, for that sweet, sweet, hospital grade food
- Coffee vendor, for that sweet, sweet, coffee.
- Public access doorway (still needs access to enter, but unrestricted
to exit, so if you spawn there and no one is around, you're not screwed)
- Button to open said public access doorway, for visitors
- Requests console, maintenance panels.

![image](https://github.com/user-attachments/assets/9ed33568-22ea-4c91-b944-cd501d5daf76)
!!Misplaced camera and light in the wall have been fixed!! Rack of
toiletries has been replaced with vendor!!
2025-06-01 10:56:16 +00:00
Batrachophreno
ba1a757909 Wires interface must require panel to be open (#20764)
https://github.com/Aurorastation/Aurora.3/issues/18299

Original bug report was for Air Alarms always displaying their wiring
interface when interacted with, even when the maintenance panel was
still closed.

I found a few other objects which also did not correctly check if wires
were accessible before displaying the interface.

There also remains some inconsistency: some objects will always display
the wire interface when clicked on with panel open, but others require
you to have certain tools in hand too (wirecutter, multitool, etc.).
Without them in-hand, they won't give you the wire UI. I'm indifferent
to which option is better, but it should be made consistent. If someone
feels at all strongly about having tools in-hand vs. not to see the
interface, then I can also make that change with whatever the prevailing
opinion is.
2025-06-01 10:54:51 +00:00
Wowzewow (Wezzy)
702472583c Scarcity and Supply Chain (#20760)
- rscadd: "Adds Lavatory vendors to the public bathrooms, that dispense
hygiene goods."
- refactor: "Migrates bartender's supply of 6 pack beers and Sencha teas
to the cargo database."
  - refactor: "Migrates impact wrenches to the cargo database."
- balance: "Removes the extraneous dylovene, kelotane, bicaridine and
coagzulug in medical. Migrates medication to the medication closet."
- balance: "Removes the unused Nanomed Minis in medical. Replaces the
surgery side Nanomed Plus with a Nanomed Mini."
- balance: "Removes the two large medical kits from medical storage, and
the kit in the exam room. Moves the wheelchairs from the morgue lift to
medical storage."
- rscadd: "Adds cranberries to the game. Now you can actually make
cranberry juice!"
- refactor: "Juices found in soda machines, booze dispensers and the
booze-o-mat have been migrated to the cargo database."
- rscadd: "Cream and fatshouters milk cartons can be ordered from
cargo."
- balance: "Certain juices are now cartons when separated in a
CondiMaster."
- balance: "Removed coffee, milk and sugar from soda machines, as they
are made redundant by CoffeeMasters."
- balance: "Non-CoffeeMaster coffee machines now just dispense coffee
instead of espresso."

TL;DR
- Juices aren't free anymore - get them from supply, the botanist, or
alternative means.
- Soda machines don't dispense coffee, milk and sugar anymore. Since we
have coffee machines already.
- Migrates the stuff in the bar that just got shoved in through mapping
that shouldve been a cargo order in the first place.
- Adds lavatory vendors, which helps to replace manually mapped in
toiletries.
- Removes the extra medical supplies from medical that end up basically
unused for most rounds.
- Adds more things that can be ordered from supply.
- Un-powercreeps the impact wrench. It's made screwdrivers and wrenches
obsolete. Imagine if all of Medical's hyposprays were the CMO hypospray.
That's how it basically is right now.

It's going to be mildly inconvenient, sure. But I have full faith that
people will get used to it in a month. I feel kind of vindicated after
the suit sensors removal PR that the mass-complaints have ceased to be
an issue, and I feel it's going to be the same case here.

Anyway, yes, it's rather silly that the Big Ass Flagship doesn't
immediately have the latest and greatest stuff, but this is thinking
towards long term towards NBT2, where we'll definitely be running a lot
more slim.

**Also, please. Don't brigade this pull request. Just ping me in the
general Discord if you have anything to bring up. I'll try respond to
you if I'm available.**
2025-05-18 14:13:48 +00:00
Greenjoe12345
5026b47053 Loadout drug changes (#20756)
This PR does the following changes:
It changes the name of the 'Smoking' tab in the loadout to 'Drugs and
Medicines'
It moves the psychiatric medicines from the Utility tab to this newly
renamed Drugs and Medicines tab
It adds a few basic OTC medicines, the same ones found in the OTC vendor
in the medical lobby (except for dexalin and dylovene)
It adds some legal recreational drugs that can be selected in the
loadout.

IMPORTANT: You will have to re-select items that you previously had in
the Smoking tab, and re-select your psychiatric medication.
2025-05-16 08:34:54 +00:00
Batrachophreno
1bace2f381 Fix Airlock Assembly deconstruction (#20766)
https://github.com/Aurorastation/Aurora.3/issues/17355

Fixed check for airlock assembly deconstruction. Also added a friendly
feedback message about installing windows, not that I had trouble with
that recently or anything.
2025-05-16 08:33:47 +00:00
Batrachophreno
0744712aeb Maintenance Panels openable with regular wrench (#20752)
To allow the fluff maintenance panels to be opened even with low-tech
standard wrenches. Not only does it make sense, but also lets them still
be opened and worked with even if Engineering were to lose its default
impact wrenches.

To facilitate the mundane wrench being used for atmos panels as a 'fix
RP' action, opening and closing maintenance panels now must be done with
the Disarm intent (with description updated to communicate the fact).

---------

Signed-off-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
2025-05-13 22:17:36 +00:00
hazelrat
a2e9e72df8 Hydroponics layout tweaks (#20749)
This implements several tweaks to the layout and contents of the
recently remapped hydroponics bay to make the space smoother and more
intuitive to play in.

The intention of the mapping here is to make D1 hydroponics a
non-liminal space to be in, it should have amenities that mean you can
spend a long time there comfortably - I believe this was also the
intention of the original PR. It contains most of the hydroponics
machines. This is also intended to ensure that you can comfortably spend
most of your time in D2 if you prefer, which is important as it's the
more visible area.

The empty middle row in the D1 hydroponics racks is intended to be an
intuitive spot to cultivate bees. There are two chairs at the desk since
there are two gardeners, and the vendors have been moved to a more
prominent spot on D2 to make it feel less liminal. I've replaced the
hatches under the hydroponics trays with outlines, as a green hatch
under a plant makes the plant pretty indistinct. Windoors have been
removed between the two areas, since they are no longer required to gate
chef access.


![image](https://github.com/user-attachments/assets/40d393ec-4201-45b8-b710-9e155f36dfcc)

![image](https://github.com/user-attachments/assets/ca7b8c40-846d-4e10-bef0-1e3d5cfd897a)
2025-05-13 22:17:26 +00:00
Stev-the-third
7a304219a4 Burzsia Flag (#20742)
Burzsia flag. Do I need to be more verbose. It's a flag for Burzsia.
That's it. What do you expect of me.

![image](https://github.com/user-attachments/assets/73ae36c4-1f5e-4502-940b-2aa43508e694)

---------

Co-authored-by: steviii <cormallenfield123@gmail.com>
2025-05-12 06:27:18 +00:00
hazelrat
231a2693c1 Expanded trap sounds + punji tweak (#20681)
This applies a sound to the act of deploying any kind of trap, applies a
sound to falling into a punji trap, and makes people collapse upon
falling into a punji trap. Intended to give more feedback, especially
considering how lethal a punji is.
2025-05-09 06:56:20 +00:00
FlamingLily
00cdeb02d1 Added a message to placing an item in your own storage container (bags, etc.) (#20679)
Title
2025-05-09 06:56:12 +00:00
Cody Brittain
fdd916dc4e Added another check for mobs buckled to roller beds (#20746)
Got stuck today due to being simultaneously buckled to a roller bed that
was being folded. Added another check to hopefully plug this issue.
2025-05-09 06:54:13 +00:00
courierbravo
3bfcf45801 Hydrobuff v2 (#20634)
Adds a bunch of stuff to the bio-generator, remaps the garden and
hydroponics, adds some new magazines, modifies the plushies selection to
include more plushies, adds a few new bounties, and throws the kitchen a
bone by giving them soy sauce on round start.

Most controversial changes are likely to be:
- I removed back access to lower hydroponics for the cook/chef, and
added a windoor and table to discourage them accessing hydroponics.
- I made the garden smaller and made the vending machine now cost money
to get fertilizer and tools. The amount of credits should be fairly
reasonable, allowing most characters to still use the garden without
issue.

---------

Signed-off-by: courierbravo <73250577+courierbravo@users.noreply.github.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2025-05-07 18:37:40 +00:00
FlamingLily
1c0eb9bdcd Makes the supply drop event have a low chance to spawn crate full of contraband. (#20720)
As the title says. Currently a 10% chance each time the random crate
spawn rolls but I'm open to reduce it if desirable.

---------

Signed-off-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
2025-04-25 10:36:28 +00:00
Batrachophreno
fd09cdf004 Allow insulated gloves to be stored in toolbelts (#20702)
As title: mechanics/electricians/tradespeople having their work gloves
tucked into their belts with the rest of their tools is pretty normal.
Tool belt's description says "...for holding various tools _and
equipment_", emphasis mine, so even though they're not strictly 'tools,'
I still think it fits (plus they're some of the only small utility items
not able to be stored in toolbelts apart from various goggles).

For consistency's sake, one could argue that ALL gloves should be able
to be stored in a tool belt if Insulated Gloves can be stored, but
keeping it simple for first PR, am good with whatever.
2025-04-13 10:15:02 +00:00
hazelrat
e344aa055d Traps & random object icon fixes (#20671)
Resolves several missing icon states for some random/ objects and traps.
Nothing user-facing, just makes them appear properly in StrongDMM.
Deleted several sprites we weren't using from punji.dmi.
2025-04-13 10:14:44 +00:00
Wowzewow (Wezzy)
305038f064 Joker Poker, feat. You have UNOOOO (#20598)
<img width="125" alt="dreamseeker_Ipg96rH5Bq"
src="https://github.com/user-attachments/assets/9da6e048-a33c-4198-90ee-e47a05fc85a0"
/>


![dreamseeker_z2UllenFYc](https://github.com/user-attachments/assets/2f6791fe-3a23-4534-9f40-9758eb62dd7d)

- rscadd: "Streamlines card mechanics. Click on others to deal to them,
yourself to draw. Ctrl-click to draw, Alt-click to shuffle."
- rscadd: "Adds KOTAHI, the shedding type card game fun for the whole
family."
  - rscadd: "Tweaks throw sound volume."
  - bugfix: "Fixes some runtimes with cards."
  - imageadd: "New sprites for playing cards."

Also seperates picking cards into it's own verb, and no more tooltips
when concealed. No more cheating.

(Also changes the throw sound volume, so it doesn't horribly spike the
volume when you're dealing normally)

KOTAHI sprites by CevUI, modified by myself.
2025-04-13 10:14:05 +00:00
hazelrat
32b492d2f9 Nanopaste balance changes (#20672)
This makes nanopaste take about twice as long to apply at a baseline, 2
seconds rather than 0.7, multiplied by five times if the mob you are
applying it to is yourself, reckoning out to 10 seconds to apply it once
to yourself. This also prevents you from applying nanopaste multiple
times at once, so this time limit can't be contravened.

The intention of this is to discourage using nanopaste mid-firefight,
which has been very powerful in the past since it took less than a
second to apply and could be spammed repeatedly to speed that up even
further. I also hope that it'll encourage IPCs to ask for help to apply
nanopaste, involving other people in the repair process, or to simply
use the workshop now that nanopaste is less instantaneous.
2025-04-13 10:13:37 +00:00