6623 Commits
Author SHA1 Message Date
Timothy TeakettleandGitHub 77fda416a6 fixes dead holospheres showing as alive in the orbit UI (#7641) 2026-08-17 22:10:06 +02:00
Timothy TeakettleandGitHub 0c84a9c26d fix ghost roles not getting holosphere gear (#7647) 2026-08-17 22:07:05 +02:00
Timothy TeakettleandGitHub 5270c3feba fixes holosphere shells not getting real_name set resulting in quirky behaviour (#7644) 2026-08-17 22:06:56 +02:00
ShadowandGitHub 882f6683e1 Using the ballista now triggers an ATC message (#7588) 2026-08-17 22:06:04 +02:00
e72b12c074 Updates Pride Pins (#7623)
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2026-07-10 17:08:03 +02:00
GySgtMurphyandGitHub edca4e0b0a Update scori.dm (#7628) 2026-07-07 15:50:37 +02:00
GySgtMurphyandGitHub 72bcc02416 Update seed_datums.dm (#7629) 2026-07-07 15:50:01 +02:00
siliconsandGitHub 63ec32b070 fixes light range CI (#7625) 2026-07-03 18:07:08 +02:00
d9031e23ce fixes some bugs (#7620)
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2026-07-03 18:05:10 +02:00
ShadowandGitHub e610a1d45d Fixes resleeving code (#7610)
## About The Pull Request

Fixes some missing backend to actually allow you to put bottles of
biomass into grower pods. Also restores the mirror tool's ability to
directly put mirrors into the resleeving machines.

This PR has been tested locally.

## Why It's Good For The Game

Currently, resleeving is completely nonfunctional since you can't load
grower pods with biomass. This fixes that, and restores a previous QOL
thing for the mirrortool.

## Changelog
🆑
fix: Fixed grower pods not accepting bottles of biomass.
fix: Fixed being unable to use the mirror tool to directly put mirrors
into machines.
/🆑
2026-06-21 16:53:48 -04:00
b6c015b7e6 adds pride pins (#7609)
## About The Pull Request
its #5234 again, without merge conflicts

I honestly think the original arguments against this were pretty moot
and everyone that spoke out against it on github has since left the
community
## Why It's Good For The Game
If you want to you can now wear pride pins on your character, much like
80% of all clothing items we have, it serves no mechanical purpose,
besides letting people express themselves
## Changelog
🆑
add: Added Pride-Pins
/🆑

---------

Co-authored-by: FreeStylaLT <freestyla8@gmail.com>
2026-06-21 16:53:12 -04:00
ShadowandGitHub e5175eb8cf Fix incorrect raptor iconsets (#7616)
## About The Pull Request

Self-explanatory

## Why It's Good For The Game

Quick fix

## Changelog
🆑
fix Fixed the colors for the raptor cyborg model being incorrect.
/🆑
2026-06-21 16:51:51 -04:00
GySgtMurphyandGitHub b5b31f4691 Scori Alchemy update (#7601) 2026-06-11 20:49:20 +02:00
ShadowandGitHub 69fa0979a8 Removes ability for ICs to communicate across maps (#7603) 2026-06-11 20:46:24 +02:00
siliconsandGitHub e57215146f fixes some bugs (#7604) 2026-06-11 20:45:38 +02:00
ShadowandGitHub 6eed753aad Bows no longer have safeties (#7599)
## About The Pull Request

Self-explanatory

## Why It's Good For The Game

Self-explanatory

## Changelog
🆑
fix: Bows (and bow variants) no longer have safeties that need to be
toggled.
/🆑
2026-06-07 15:34:02 -04:00
c0c51707f5 Lighting: Reject absurd values (#7583)
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2026-06-07 16:58:56 +02:00
GySgtMurphyandGitHub 3a17487bbb scori crafting stuff (#7587) 2026-06-07 12:18:05 +02:00
Timothy TeakettleandGitHub f61686f047 fixes zaddats not spawning in with the correct survival gear (#7595) 2026-06-07 12:17:35 +02: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
ShadowandGitHub 4fcb732c23 Racking guns is now much quieter (#7589) 2026-05-28 18:06:12 +02:00
Putnam3145andGitHub 58238a149a Made the R-UST light values not nonsense (#7582) 2026-05-28 18:05:03 +02:00
GySgtMurphyandGitHub b64d2c30dc Update recipes_primal.dm (#7578) 2026-05-24 17:53:16 +02:00
Timothy TeakettleandGitHub 0e3eef37c8 several bugfixes (#7577) 2026-05-15 19:31:46 +02:00
Letter NandGitHub ae13ea85ea add missing stuff from the interaction update (#7531) 2026-04-06 19:48:44 +02:00
SorrowfulwindsandGitHub ed18f2adc6 Make bunny ears seperately colorable, adds several generics markings for coloring half of the torso. (#7543)
## About The Pull Request
Makes 5 bunny ears separately colorable.
Adds several markings to let you add chunks of color to the torso and
limbs, which can be combined to make half the body a different color if
desired.
<img width="324" height="241" alt="image"
src="https://github.com/user-attachments/assets/49121427-c484-4b28-96cb-9d558a695402"
/>
<img width="89" height="116" alt="image"
src="https://github.com/user-attachments/assets/89c449ee-adda-4107-afaa-a42e61554ec2"
/>

## Why It's Good For The Game
Personalization is coole

## Changelog
🆑
add: Added new body markings
add: Added new submarkings for rabbit ears
/🆑
2026-04-05 04:06:23 -04:00
siliconsandGitHub 8691debec5 fixes extreme planet lighting lag (#7554) 2026-03-29 21:33:23 +02:00
siliconsandGitHub e01b0a36b2 fixes cyborg gripper issues (#7558) 2026-03-28 20:41:37 +00:00
siliconsandGitHub e7ab3f49d7 gravity generators now use new overmaps location api (#7549) 2026-03-28 20:38:32 +00:00
Timothy TeakettleandGitHub 56475d6021 fix a handful of bad references to player_levels (#7559)
## About The Pull Request
<img width="391" height="54" alt="image"
src="https://github.com/user-attachments/assets/109044e2-a68c-4353-988e-e1747156387b"
/>

also a few events are fixed

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

## Changelog
🆑
fix: fix a handful of bad references to player_levels
/🆑
2026-03-28 15:21:22 -04: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
siliconsandGitHub 62a816d917 fixes books (#7541) 2026-02-28 19:21:02 +00: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
fb432cd41a airlocks 2.0 (#6593)
Co-authored-by: silicons <silicons@silicons.dev>
2026-02-24 09:41:01 +01:00
Timothy TeakettleandGitHub 2b6046c529 fix the security wintercoat not showing in the loadout (#7538)
## About The Pull Request
fix the security wintercoat not showing in the loadout

loadout item for HoS wintercoat had the same path

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

## Changelog
🆑
fix: fix the security wintercoat not showing in the loadout
🆑
2026-02-23 00:23:10 -05:00
Putnam3145andGitHub 8693fbab1a fixes security winter coat in loadout (#7540)
## About The Pull Request

fixes security winter coat in loadout

## Why It's Good For The Game

literal typepath typo

## Changelog
🆑
fix: security winter coat now in loadout as intended
/🆑
2026-02-23 00:22:49 -05:00
siliconsandGitHub c07901dbc7 Fixes early transfers, round time is now not going to pass until the round starts (#7525)
we never checked if the round began before calling round time

closes #7524 
closes #7523
2026-02-18 12:40:43 +00: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
its-helviandGitHub ac7aa1afca fixes erp (#7536)
## About The Pull Request
Makes the subtler-anti-ghost keybind actually run the subtler verb. 
## Why It's Good For The Game
:slime:💥
## Changelog
🆑
fix: subtler keybind now runs subtler instead of subtle
/🆑
2026-02-15 16:06:05 -05:00
siliconsandGitHub ab50522b15 fixes some bugs (#7492) 2026-02-11 18:34:47 +01:00
Letter NandGitHub c93e2c7679 tracy (proper this time) and debugger (#7496)
<!-- 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
port genisis proc from tg, also tracy & debugger is boxed in their own
datums.
also explode world.dm
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

merg
https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/7495
and
https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/7497
before this one
2026-02-11 12:26:19 -05:00
Timothy TeakettleandGitHub ac64c76d4a fixes holosphere crew sensors showing they're alive when dead + fixes being able to transform while dead (#7503) 2026-01-29 10:48:05 +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
Letter NandGitHub fed38ec2c8 update tgs commands (#7511) 2026-01-26 10:52:19 -08:00
Letter NandGitHub 7d004f3ff8 update rustg (#7497) 2026-01-26 10:51:59 -08:00
Letter NandGitHub cf70464470 properly name ui icon folders (#7509) 2026-01-26 10:49:56 -08: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
Letter NandGitHub f2bacf76c9 update admin atom spawning (#7498)
update atom spawning menu, now with less ™️ lag
2026-01-24 14:31:15 -05:00