1956 Commits
Author SHA1 Message Date
GySgtMurphyandGitHub b5b31f4691 Scori Alchemy update (#7601) 2026-06-11 20:49:20 +02:00
siliconsandGitHub e57215146f fixes some bugs (#7604) 2026-06-11 20:45:38 +02:00
GySgtMurphyandGitHub 3a17487bbb scori crafting stuff (#7587) 2026-06-07 12:18:05 +02:00
ShadowandGitHub af05eae20a Saw traps no longer automatically chop off legs and feet (#7585)
## About The Pull Request

Changed the saw traps to apply their damage directly to their targeted
limb instead of immediately severing it.

This PR has been tested locally.

## Why It's Good For The Game

The saw traps in some exploration areas, for some reason, automatically
sever your feet/legs when stepped on, on top of applying their actual
damage. This seems overly harsh especially given the chaotic nature of
exploration, so I have changed them to simply apply their damage to a
leg/foot when stepped on. Their damage is enough to significantly injure
someone with even a couple steps, and repeatedly walking into them if
you are careless will eventually break/sever the limb anyway.

## Changelog
🆑
balance: Saw traps will no longer immediately sever limbs when stepped
on.
/🆑
2026-05-29 02:46:21 -04:00
AlphaM01andGitHub 154e024607 Blud changes, seasonal consumables, new cocktail recipe, and other miscellaneous fixes. (#7592)
## About The Pull Request
This PR includes a few different things mostly revolving around food and
drinks:
1) **BLUD REBALANCE**
Blud has been changed significantly. This change will be accompanied by
an IC bulletin and OOC dev blog post, the changes are as follows:
- Blud can now always be consumed, even when you're starving.
- Blud is now metabolized after ingestion at the same rate as regular
blood (a lot faster than previously).
- Blud's blood_content values have been bumped significantly. 30u of
real Blood restores ~120 nutrition, while 30u of Blud restores 25% less
nutrition, at ~90 (tested in-game).
- Blud boxes now contain 50u instead of 30u. For reference,
regular-sized milk cartons are 50u and mini milk cartons are 30u.
- Cargo's Vetalan Care Package now consists of 5 boxes of Blud MAX and
another 5 boxes of Blud MAX Light, for a total of 250u of real Blood and
250u of Synthblood. Previously it consisted of 3 bags of AB+ which are
200u each for 600u of Blood.
The suit that comes in the care package was also deleted, but it still
comes in a nice coffin.

2) **SEASONAL ITEMS**
All of the items from last year's Christmas testmerge have been re-added
with a few minor updates.
New Halloween themed items have also been added.
These seasonal items are fully functional, but **can't be obtained
currently since they're not taking advantage of the seasonal item
rotation code at this time.**
The full list of items is as follows:
- Two new cigarette varieties, Temperamento Vanilla (Xmas) and Kaiju
Cherry (Halloween)
- Three new types of bottled alcohol, Caramel Whiskey (Xmas), Sour Apple
Schnapps (Halloween) and Candy Corn Flavored Vodka (Halloween)
- Seven new cocktails using seasonal ingredients, Caramel White Russian
(Xmas), Salted Caramel Cider (Xmas), Appletini (Halloween), Sour Apple
Mimosa (Halloween), Sour Apple Fizz (Halloween), Candy Corn Martini
(Halloween) and Halloween Punch (Halloween).
- There is also a "food synthesis" recipe for turning the candy corn
martini into edible jello shots using water and protein.
- Three new snacks, Gingerbread Cookies (Xmas), Stroopwafels (Xmas) and
Holiday Cake (Xmas, Contraband). Halloween snacks will hopefully be
added later down the line.
- Four new soda varieties: Space Cola Cinnamon (Xmas), Space-Up
Cranberry (Xmas), Space Cola Licorice (Halloween) and Dr. Gibb Mystery
(Halloween).
- One new canned coffee variety: Peppermint Mocha (Xmas). Halloween
variety will hopefully come along with the snacks. It's a lot of
spriting work.

3) **ASSORTED FIXES AND QOL IMPROVEMENTS**
- Bar and Cafe vendors now stock canned Pineapple juice year-round, this
is generally useful but especially handy for the halloween vodka
cocktails.
- One new year-round cocktail recipe: The AMF.
- Robust Softdrinks no longer stocks KyoCola, Ocha Midori and Ramune,
since those are already present in the NipponTan vending machines. This
cuts down on that particular menu's bloat a little.
- Temperamento Menthol Company now called Temperamento Tobacco Company
- CC's Hard Rootbeer proof is now calculated as VODKA/2, slightly
lowering it's proof from 50 to 40. This was done because the bottle desc
for this drink states it's regular rootbeer with vodka added.
- BludBox MAX no longer calls donors "free-range", the blood is now
"ethically-sourced" instead.
- The lore entry on Vetalan Outreach Society has been brushed up and
also had typos corrected.
## Why It's Good For The Game
1) Vetalans, Medical and Blud have been in need of addressing for a
while now, and this is the mechanical part of the effort, making
Vetalans less reliant on blood bags.
2) The seasonal item system is here. The groundwork and the first batch
of items are laid out, I just need to figure out how to implement and
test the seasonal rotations.
3) Most of these are QoL and fixes. The AMF came into being very late at
night after the brainworms won.
## Changelog
🆑
add: Added two new brands of seasonal cigarette.
add: Added three new brands of seasonal alcohol.
add: Added four new varieties of seasonal soda.
add: Added seven new varieties of seasonal cocktails.
add: Added one seasonal variety of food synthesis reaction.
add: Added three new varieties of seasonal snack food.
add: Added one seasonal variety of canned coffee.
add: Added one new regular cocktail.
add: Added Pineapple Juice cans to Bar and Cafe vendors.
del: Removed NipponTan drinks from Robust Softdrinks stock.
tweak: Temperamento Menthol Company renamed to Temperamento Tobacco
Company.
tweak: Small changes to the Vetalan Outreach Society advertisement.
tweak: Small changes to BludBox MAX description.
tweak: Blud now always nourishes Vetalans regardless of nutrition
status.
tweak: Blud now metabolizes at the same rate as Blood when ingested.
tweak: Blud now provides Vetalans with 75% the nutritional value
compared to Blood.
tweak: Vetalan Care Package now contains BludBox MAX and BludBox MAX
Light cartons instead of AB+ Blood Packs.
tweak: Vetalan Care Package no longer contains a suit.
tweak: BludBox cartons now hold 50u, up from 30u.
tweak: CC's Hard Rootbeer proof now calculated in a more lore-friendly
manner.
fix: Pineapple juice no longer purple when poured into a metamorphic
glass.
imageadd: added sprites for all item additions listed above.
/🆑
2026-05-29 02:45:35 -04:00
Timothy TeakettleandGitHub 8d18b84d96 fix taking beakers out of grenades (#7586) 2026-05-28 18:05:48 +02:00
Timothy TeakettleandGitHub 0e3eef37c8 several bugfixes (#7577) 2026-05-15 19:31:46 +02:00
siliconsandGitHub 21cf7b6145 replaces uses of search contents for with faster get all contents filtered (#7547) 2026-03-28 20:43:21 +00:00
siliconsandGitHub e01b0a36b2 fixes cyborg gripper issues (#7558) 2026-03-28 20:41:37 +00:00
its-helviandGitHub 2f92e2021d dm is a curse (#7560)
## About The Pull Request
Random various bugfixes to random various things.
## Why It's Good For The Game
:slime:🔧
## Changelog
🆑
fix: Power network interface circuits work again.
fix: You can now heal prosthetics with cables again.
fix: Protolathes should no longer bluescreen when destructively
analyzing material sheets.
fix: Destructively analyzing advanced TTS circuits is no longer morally
dubious.
/🆑
2026-03-28 15:20:07 -04:00
935126228a [IDB IGNORE] [MDB IGNORE] entirely rewrites mirrors and throws out old resleeving backend (#7446)
Co-authored-by: silicons <silicons@silicons.dev>
2026-02-24 09:41:30 +01:00
Timothy TeakettleandGitHub eb3352489b fix checkers icons (#7516)
## About The Pull Request
fix checkers icons

## Why It's Good For The Game
fixes a bug

## Changelog
🆑
fix: fix checkers icons
/🆑
2026-02-23 00:23:52 -05:00
27553ac31b repaths spiderlings/vines to structures instead of effects (#7530)
- spider webs / vines should never have been effects in the first place
- spiderlings should probably just be mobs at some point lol

---------

Co-authored-by: Zandario <zandarioh@gmail.com>
2026-02-18 12:40:19 +00:00
FreeStylaLTandGitHub a6db2e8807 valentine stools (#7535)
## About The Pull Request
<img width="66" height="80" alt="image"
src="https://github.com/user-attachments/assets/fe252fea-74b4-4b6e-a9a5-5d605270795c"
/>

## Why It's Good For The Game
heart

## Changelog
🆑
add: Added Valentine stools
/🆑
2026-02-15 16:06:27 -05:00
siliconsandGitHub ab50522b15 fixes some bugs (#7492) 2026-02-11 18:34:47 +01:00
Letter NandGitHub d50ea14baa effect cleanup (#7502)
yeah, also updates emissive blockers
2026-01-27 12:44:16 -05:00
Letter NandGitHub fcdae04ae0 map cleanups (#7504)
cleanup map files
2026-01-27 12:43:51 -05:00
0557800d31 sync tools & ci (#7449)
title

---------

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2026-01-24 19:42:25 +00:00
Letter NandGitHub b378375888 update blueprints (#7499)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title, robots also get to see the blueprints now
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
tweak: updated blueprints, engi module robots now get blueprints as well
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-24 14:34:39 -05:00
siliconsandGitHub 6144b87b9a [IDB IGNORE] [MDB IGNORE] orbital support update 1 / 3 (#7361) 2026-01-20 14:46:22 +01:00
Letter NandGitHub bb1928530c optimize closet init (#7495)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
stops closet from calling take_contents twice
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-20 08:26:06 -05:00
Letter NandGitHub cb37c3ba0a implement INTERACT_ATOM_* (#7465)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title, will be used when i tgify machines (upgradable machinery)
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
code: properly implement `INTERACT_ATOM_*`
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-14 00:06:48 -05:00
Letter NandGitHub 37c6a7d1fc time, is it really that time (#7482)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
update time related procs & glob too (i was originally targeting that
lmao).
also **stop** using byondtime for sql stuff, we have `NOW()`!!
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-13 22:06:30 -05:00
Letter NandGitHub 00045a5961 update vv (#7478)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
add: new adminbuse view matrix editor
code: cleanup legacy stuff & moved them into their own respective
dropdown option
code: use tg display-mutable-appearance
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-13 22:03:31 -05:00
b4a124e557 [IDB IGNORE] cyborg refactor: icons, chassis, modules base (#6929)
- separates the composition of cyborgs into modules, iconsets, chassis,
upgrades
- modules / chassis atm can provide items, so can upgrades; in the
future we will want to probably generalize the item API a bit so
components can work
- chassis now can (unimplemented) easily be made to give different stats
- reorganizes all the cyborg sprites
- adds generalized item mounts with redirection support and tears out
legacy cyborg items
- entirely rebalances modules & writes some new lawsets in for future
use

---------

Co-authored-by: silicons <silicons@silicons.dev>
2026-01-13 18:39:38 +00:00
Letter NandGitHub bd9a49dd7e pixel w/z stuff (#7477)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
byond shenanigans
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
add: you can now point items inside your inventory
tweak: update fulton
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-13 13:38:48 -05:00
Letter NandGitHub 17961ae93c update safe (#7466)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title, preferably merge
https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/7467
before this
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
tweak: safes are 20% more cooler, also you can break it open with 3
large-sized explosives
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2026-01-11 02:28:42 -05:00
30fbcfe9b4 Belts & Trashbags (#7443)
requires #6644 

Entirely replaces how (most) belts perform insertion checks.

This pretty much allows belts to hold most things.

Armor vests are next.

Trashbags will also use the systems we use on main.

Closes #7256 and #7435

---------

Co-authored-by: silicons <silicons@silicons.dev>
2025-12-28 22:05:06 -05:00
siliconsandGitHub b4315a284f fixes cells (#7445) 2025-12-27 17:21:15 +01:00
b1029a24f8 Power Cell Rework + Energy Weapon Rebalance (& misc changes) (#7438)
- all cells in the game are now small, medium, large
- super, hyper capacity cells, device, and weapon cells are all removed
- cells now have standardized variants, some of which are printable by
R&D
- energy weapons rebalanced
- **advanced energy guns and stun revolvers removed** - use the new
modular weapon system and microfission cells.

---------

Co-authored-by: silicons <silicons@silicons.dev>
2025-12-24 12:15:01 +01:00
LordMEandGitHub ecec05522f reduces old variable bloat (#7440)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
removes the adminbus_trash variable
removes the option to play audible hunger noises
removes option to TF people into eggs
Moves the feral variable from /mob/living to the xenochimera species
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Unused variables are not helpful.
TF to egg is unused and broken.
only chimera uses the feral variable anyway, and even then it mirrors
the mob variable for use, so lets just move it to chimera
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
del: Removed unused variables that held over from vorestation
del: Removed Vore belly transform to egg options
del: Removed audible hunger noises
tweak: tweaked feral to be a chimera specific variable, instead of a mob
variable thats only used by chimera
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-12-21 15:18:33 -05:00
死烏andGitHub 8d9c2032cf Railings Suggestion (#7434) 2025-12-21 13:22:14 +01:00
siliconsandGitHub 60db51850c experimental gc / init fixes and optimizations, and fixes emotes (#7431) 2025-12-15 09:13:19 +01:00
siliconsandGitHub 6736ce43d5 bugfixes 3 (#7414) 2025-12-12 18:53:15 +01:00
ColferandGitHub fa15787f3a Antrumite plushy (#7416)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds the antrumite plushy
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Cute expie plushy with cute little noises
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
add: Adds the antrumite plushy, based off expies from scav prototype
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-12-12 00:57:31 -05:00
Timothy TeakettleandGitHub 9922cc9c28 fix some icons + roast beef spawning the wrong trash (#7421)
## About The Pull Request
fixed icons for: reindeer hat, 12.7mm ammo, green marker beacon (this
isnt a thing, it's just the olive option)
fixed roast beef spawning waffle trash instead of plate trash
fixed initial defib paddles sprite 

## Why It's Good For The Game
fixes bugs

## Changelog

🆑
fix: fixed icons for: reindeer hat, 12.7mm ammo, green marker beacon
(this isnt a thing, it's just the olive option)
fix: fixed roast beef spawning waffle trash instead of plate trash
fix: fixed initial defib paddles sprite 
🆑
2025-12-12 00:50:39 -05:00
Athena148andGitHub 0e39e6c45c Xenomorph Monarch Fixes/Rebalance (#7418)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Applies a nerf to Monarch's charge, no longer instantaneous.
Lowers Monarch's burn/energy resist, burn should work better against it
since Xenomorphs are weak to fire.
Axes **any** and all mentions of natural spawn positions, this should
never spawn naturally. It is a boss mob.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

This has been an issue for a while, but the natural spawn points for the
Monarch were the last straw. Oopsies.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
balance: lowers Monarch's burn resist, makes charge not instant.
fix: Removes any reference to the Monarch spawning naturally, probable
or not.
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-12-05 11:34:28 +01:00
siliconsandGitHub 3492998c87 fixes a few bugs, rewrites station time system (#7402)
see tin

fixes tgs4 scripts for linux too and updates them
2025-11-21 10:20:07 -07:00
ColferandGitHub 69e9ce7a92 Alraune fruits, buildable fey grass, & soil (#7401) 2025-11-14 13:15:47 -05:00
SorrowfulwindsandGitHub 97d3f44efb Fix cuff sprites, touch up code (#7387)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Moves fuzzy cuff and bola sprites (all subtypes of handcuffs) to
handcuffs.dmi

Replaces the vague and mysterious magic numbers with SECOND and MINUTE
macros.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Fixes fuzzy cuff & sinew cuff sprites and cleans up the code by
centralizing icons and using macro times.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog
Moves fuzzy cuff and bola sprites (all subtypes of handcuffs) to
handcuffs.dmi

Replaces the vague and mysterious magic numbers with SECOND and MINUTE
macros.
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
fix: fix fuzzy cuff & sinew cuff sprites
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-11-14 12:29:11 -05:00
4ab234f10c maploader / overmaps update - struct system, overmaps location bindings, misc backend improvements (#6403)
tl;dr level collections that can easily be logically restructured/moved
as necessary

will eventually be used for radio and overmaps location resolution.

this is the last part of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/4841
that has not yet been integrated.
this will be a draft for a while.

---------

Co-authored-by: LetterN <24603524+LetterN@users.noreply.github.com>
2025-11-06 17:49:23 -08:00
siliconsandGitHub 8402a432dc refactors suit storage allowed + new vv bitfield system (#7381) 2025-11-04 10:19:15 +01:00
siliconsandGitHub 5f16804ab2 riot suppression electrostaff (#7365) 2025-11-04 10:19:06 +01:00
SpartanKadenceandGitHub 922065d3bb The Recycling Pad (#7351) 2025-10-16 18:55:55 +02:00
siliconsandGitHub ef10c0abcc lore enforcement update (#7358) 2025-10-15 18:40:42 +02:00
siliconsandGitHub 0ee3c0b0bf don't merge stacks at mapload (#7359) 2025-10-15 18:37:57 +02:00
LordMEandGitHub bb8c7ae137 catch disabled and abstract materials for throw hit sounds (#7335)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
fix: fixed /obj/hitsound_throwhit() runtiming when src has
marterial_primary set to "DISABLED"
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-10-14 10:49:37 -04:00
ShadowandGitHub fd8da8c6d3 Some adjustments for guest passes (#7346)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Updates some guest pass code to fix a bug where they were not turning
red when expiring. Also cleans up their examine text, and adds the
person's name to the title to more easily identify who it's meant for
(similar to an actual ID).


<img width="888" height="261" alt="image"
src="https://github.com/user-attachments/assets/016cf9b1-bc27-4bad-b461-2ad7cdb55c70"
/>

<img width="1064" height="78" alt="image"
src="https://github.com/user-attachments/assets/5c430b63-ffb6-4e7e-8027-291f91cde445"
/>


## Why It's Good For The Game

The sprite fix is arguably necessary as it helps clarify immensely
whether a guest pass has expired or not. The rest are minor QOL
adjustments.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
fix: The stripe on guest passes will now turn red when they expire.
tweak: The examine text on a guest pass is now formatted correctly.
tweak: Guest passes will now show the issued person's name on them,
similar to an ID.
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-10-14 10:47:53 -04:00
Timothy TeakettleandGitHub 853539d56b fix a lot of issues with holospheres (#7337)
## About The Pull Request
fixes instantly reviving
fixes reviving not taking nutrition
fixes chameleon jumpsuits ignoring species sprites
fixes transforming when in a recharge station
fixes reviving resetting you to the current slot
reduces the amount of nutrition to revive
increased time until you can revive to 4 seconds

## Why It's Good For The Game
fixes instantly reviving
fixes reviving not taking nutrition
fixes chameleon jumpsuits ignoring species sprites
fixes transforming when in a recharge station
fixes reviving resetting you to the current slot
reduces the amount of nutrition to revive
increased time until you can revive to 4 seconds

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
fix: fixes instantly reviving
fix: fixes reviving not taking nutrition
fix: fixes chameleon jumpsuits ignoring species sprites
fix: fixes transforming when in a recharge station
fix: fixes reviving resetting you to the current slot
balance: reduces the amount of nutrition to revive
balance: increased time until you can revive to 4 seconds
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2025-10-10 22:18:29 -04:00
siliconsandGitHub f76aeb8f33 refactors admin narrate (#7319) 2025-10-08 23:51:38 +02:00