55 Commits
Author SHA1 Message Date
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
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
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 60db51850c experimental gc / init fixes and optimizations, and fixes emotes (#7431) 2025-12-15 09:13:19 +01:00
siliconsandGitHub 8402a432dc refactors suit storage allowed + new vv bitfield system (#7381) 2025-11-04 10:19:15 +01:00
77969e8214 Big Mech Time/Quasimodo Addition (WIP) (#7334)
<!-- 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
This prepares the grounds for 3x3 mechs to be added into the game,
starting off with the first trial of the Quasimodo. The Quasimodo is
designed to carry a single large, anti tank weapon, with minimal room
for other equipment or weapons. The idea is to make it large and tanky,
but at the cost of it not being able to be repaired unless attached to a
mech platform to hold it(To be Added). The weapons planned to be
attached to it is an explosive, Anti Tank/Anti Building Cannon, with
more like it along the way.
<!-- 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
I'll be honest, this was mainly for fun. I remember that people have
been wanting larger mechs for a while, so I wanted to try my hand at it.
At the very least, if my mech doesn't get approved for crew creation,
it'll still lay the grounds for other coders to create larger mechs for
events/crew usage.
<!-- 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

- ✓ Adds the Quasimodo!

- ✓ Adds the HAG-30(AC-20) 

- ✓ Adds a new mech weapon class! (Heavy Arms)

- (WIP) Adds the mech platform to create and repair the new 3x3 mechs
with!

- ? Doesn't send the server into hell over the balance of 3x3 mechs!
(Optional)



https://github.com/user-attachments/assets/2a811bc3-0076-4561-ab22-1049bff95d61



https://github.com/user-attachments/assets/8872563e-6ed3-43e7-924f-e6b902556171



https://github.com/user-attachments/assets/9f6513c5-cc56-4249-8a16-284fbf2442c7


<!-- 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. -->

🆑 Kade
add: Adds the new 3x3 mech class and the Quasimodo to go along with it.
Also includes a weapon class (Heavy) to be used along side the 3x3
mechs.
/🆑

<!-- 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. -->

---------

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2025-10-16 13:56:45 -07:00
siliconsandGitHub a3b0d5602b changes statpanel macros (#7287) 2025-09-03 19:31:13 +02:00
siliconsandGitHub e5316fbaf5 refactors click handling (#7286) 2025-09-03 19:30:39 +02:00
7e8cd3f5ac refactors combat backend & adds kinetic gauntlets (#7144)
Co-authored-by: Zandario <zandarioh@gmail.com>
2025-05-31 19:30:25 +02:00
siliconsandGitHub 1fb3828254 ballistic refactor (#7019)
yeah turns out gun refactor wasn't done

- adds proper chamber handling
- fixes a lot of ballistic guns
- temporarily disables a lot of bolt handling
- refactors microbatteries
- fixes shotguns
2025-03-11 21:40:32 +01:00
siliconsandGitHub 4137b01947 guncode update (and misc refactors) (#6740) 2025-02-22 16:31:23 +01:00
siliconsandGitHub 6394f34694 repaths projectile weapons from /obj/item/gun/* to /obj/item/gun/projectile/* (#6997)
tl;dr we don't want snowflaking for "projectile firing gun" to be the
same as "launcher firing gun" so we're separating them

this is in prep for #6740
2025-02-14 22:38:22 -07:00
85e24504a1 running bugfix PR (#6914)
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2024-12-23 16:22:00 -07:00
siliconsandGitHub 7678e98fa0 nt expeditionary weapons (#6682) 2024-10-14 16:32:21 +02:00
siliconsandGitHub 2533caefd9 combat code overhaul + projectiles v8: impact handling (#6579) 2024-09-02 20:34:27 +02:00
siliconsandGitHub 002dda4bf3 projectiles v8 - ammo & magazines (#6637)
completely overhauls ammo, magazines, and calibers; makes things a lot
more standardized and efficient.
2024-08-04 15:31:26 -04:00
AlphaM01andGitHub 234e627925 Resprites most cigarette boxes & Adds two new imported cigarettes. (#6638)
<!-- 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

So this was going to be Epsilon Eridani Imports Chapter 1, however, in
spriting the new cigarettes I became so annoyed at the fact that most of
our cigarette boxes are either a recolor or ugly, so I resprited most of
them as well. This also removes nicotine from the Blackstar brand which
is, according to Captain (who added them), not supposed to have it. (I'm
not sure nicotine even has any effects, but I've set it to zero
anyways).

Trans-stellars get to keep the original sprite, since they are the base
cig, however I've still given their open states a tiny facelift to be
in-line with all the others.
Jerichos only have small improvements, their sprite was already fine.
P100s have more noticeable changes, but largely retained the same
appearance.

Here is a visual of all the resprite changes, old on the top, new on the
bottom:

![respritebanner_large](https://github.com/user-attachments/assets/7375d821-a5f1-49af-a406-4e510f0f6f15)

As for the new cigarettes, there are two new brands.
One for lights (theoretically half the nicotine content) called Kyningc
[sic], and one for less exotic herbal cigarettes (for those who want
something less hardcore than Blackstars) called Subrosa.

Both of these are imported from Epsilon Eridani. 
I don't feel they deserve to crowd the coin section of the vending
machine, however, so I've added them into regular stock with more
limited supply (two boxes per vending machine) and increased costs
(Kyningc Silvers are the new most expensive box at 27 thaler each) to
reflect their imported nature.

These have unique cigarette sprites. White filters with a gray stripe
and all-sepia brown respectively.

Here's an exceedingly fancy preview to market these fictional products:

![Banner_EEcigs_large](https://github.com/user-attachments/assets/570a0f3a-7bc8-4bf1-87a7-7420cd2f6623)

The only other change is some changes in the wording for the
descriptions of Carcinoma Angels to be slightly less ridiculous and more
cohesive between the desc and desc_fluff without really changing the
overall story.


<!-- 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
Getting rid of boring recolor sprites is good.
Making Blackstars more mechanically accurate to their lore is good.
Tiny bit of worldbuilding with the new brands, hopefully more to follow
soon.
Carcinoma Angels were always Classic SS13 weird, but now they're a
little more believable.
<!-- 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. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. 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: Added two new imported cigarette brands to vending machines.
tweak: Updated Carcinoma Angel descriptions.
tweak: Updated or resprited most cigarette box 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. -->
2024-08-01 19:20:05 -07:00
siliconsandGitHub 5134116de4 supply: supply pack datums, some reworks (#6599)
tl;dr refactors supplypacks to a new system

- all access locks yanked from crates other than the ones that actually
need to be locked
- preps system for reworks, translates stuff over to a new format
- adds unified subsystem parsing & support for other descriptors for
cargo crate contents other than typepath
2024-07-31 10:28:39 -04:00
siliconsandGitHub 912e379ffb vehicle mechs - preliminary (#6606) 2024-07-22 19:59:56 -04:00
BlueWildroseandGitHub ef9b94990f Lunchbox additions, fixes liquid ration problem (#6572)
<!-- 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

- Fixes things not being properly pathed and resulting in an invisible
"snack" where LiquidFood was intended instead.

Adds the following to the lunchbox loadout options:
- LiquidProtein Ration
- Blood Sausage
- Moghesian Sea Delight
- Bludbox and Bludbox Light
- Milk and Chocolate Milk
- Dumb Bitch Juice

## Why It's Good For The Game

This is primarily a PR focused on giving vetalan, xenochimera, unathi,
or just someone who likes blood some lunch options for their lunchbox.
Otherwise, fixes good.

<!-- 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. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. 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 a few new options for the lunchbox loadout item, particularly
blood-related foods for vetalan and xenochimera folk.
fix: A few areas where liquidfood was pathed improperly is now pathed
properly.
/🆑

<!-- 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. -->
2024-07-06 01:17:59 -07:00
Letter NandGitHub 23b3274778 NT & CC Namefix (#6333)
<!-- 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
muh immursion!
<!-- 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
🆑
spellcheck: CentComm => Centcom
spellcheck: NanoTrasen => Nanotrasen
/🆑

<!-- 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. -->
2024-03-13 16:01:23 -07:00
LordMEandGitHub 11c8aae64a door tint fix & door overlay fix (#6209)
<!-- 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
Makes behaviour more to what its intended to be
<!-- 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. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. 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 how door tinting works (it was a mess)
/🆑

<!-- 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. -->
2023-12-29 22:18:33 +00:00
f00535983e [MDB IGNORE] [IDB IGNORE] atom damage (#5235)
## About The Pull Request

adds generic system for atom health / integrity / damage

everything that isn't flagged with not-bludgeonable can, well, now be
bludgeoned.

## Why It's Good For The Game

more interactive game world through the means of making people able to
break Everything.

## Changelog

🆑
add: atom damage - (almost) everything is now breakable.
refactor: new /atom level materials system
refactor: a lot of the combat system / click code
refactor: melee attack styles
/🆑

---------

Co-authored-by: silicons <no@you.cat>
2023-11-11 17:33:57 -07:00
Captain277andGitHub a33aaeb975 Mecha Lore Revisions, Retcons, and General Edits (#6027)
<!-- 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

1. **Revises, Retcons, and/or Edits Mecha Fluff Descriptions to Match
New Standards.**
2. **Adds the 8-Ball Paint Kit and Updates Paint Kits.**

## Why It's Good For The Game

1. _This PR alters the majority of Cataloguer scans for Mecha mobs and
copies them over as the fluff description for the relevant mech models.
The information contained here should be available on examination,
without the need for a cataloguer and a simplemob encounter. Many of the
entries needed to be edited for general quality and formatting, or to
bring them in line with our lore. Otherwise this is pretty
straightforward._
2. _8-Ball is an event mech that I've decided deserves a custom paint
kit to make it more recognizable. As a byproduct of this, paint kits now
also update Fluff Descriptions._

## 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. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. 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: Revises, Retcons, and Edits the Lore Data for all Mechs.
add: Adds 8-Ball Paint Kit.
tweak: Paint Kits now update fluff descriptions too.
/🆑

<!-- 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. -->
2023-09-28 20:41:35 -07:00
Captain277andGitHub d84bacb769 Canonizes the LiquidFood Straw, Adds Opening Proc to Foods For Snack Purposes, Seals Snack Foods (#6017) 2023-09-26 19:57:58 +02:00
104cb8693b hypospray update (and small reagent touchups) (and small clothing flags touchup) (#5562)
## About The Pull Request

replaces our hyposprays with.. well, better hyposprays
adds hypospray kits to medical

sprites courtesy of @granodd and aurora 😊 

furthermore, upgrades reagent system a bit (initial paths on recipes
instead of ids only) and buffs small beakers/bottles to be smaller to be
on par with large beakers, for volume efficiency.

## Why It's Good For The Game

syringes are boring and our hyposprays + their vials are shit, let's
make something cool and flashy to standardize on medical.
this is the future / sci fi, after all.

as for why to rebalance beakers/bottles:

we already have large beakers that store 2x. with the same space. it's
kind of silly to just lock this capability behind having an autolathe.

## Changelog

🆑
add: new hyposprays and hypospray vials
balance: beakers/bottles are now smaller.
add: injection port clothing flag
/🆑

---------

Co-authored-by: silicons <no@you.cat>
2023-06-06 10:16:59 -04:00
siliconsandGitHub a841032ca3 fixes armor examine formatting (#5294) 2023-04-05 22:59:29 +02:00
siliconsandGitHub 1e51e041e9 fixes armor examine (#5271) 2023-04-02 19:19:21 -07:00
LordMEandGitHub 7e297d8310 UTF 8 Cleanup (#5267)
🆑
refactor: Refactors files containing non UTF-8 characters to now be
UTF-8 Compliant
/🆑

<!-- 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. -->
2023-04-02 01:24:48 -07:00
8b778b0321 Armor rework (#5158)
Co-authored-by: silicons <no@you.cat>
2023-03-25 11:58:25 +01:00
257d52c83d renames a lot of item flags, organizes flags, introduces item_persist_flags (#5070)
Co-authored-by: silicons <no@you.cat>
2023-03-08 12:28:26 -06:00
siliconsGitHubVM_USER <VM_USER>silicons
fb429e51a4 KILLS STATPANEL (#4877)
Co-authored-by: VM_USER <VM_USER>
Co-authored-by: silicons <no@you.cat>
2023-01-11 09:12:35 -06:00
seekssssandGitHub 55da42c20a hot cheetoes v4: finally properly merged edition (#4947) 2023-01-11 08:05:20 -06:00
fd91cb3b08 [MDB IGNORE] ballistic gun repath & lazyinit ammo & casing flags & reorganiation (#4908)
## About The Pull Request

tin

## Why It's Good For The Game

memory improvements & code efficiency

## Changelog

nah

Co-authored-by: silicons <no@you.cat>
2023-01-05 19:10:40 -08:00
siliconsGitHubVM_USER <VM_USER>
fa3856bf7f renames flags to atom_flags for, well, atoms; transitions some reasonable atom flags to be more, well, obvious (#4837)
Co-authored-by: VM_USER <VM_USER>
2022-12-15 18:54:20 +01:00
siliconsGitHubVM_USER <VM_USER>
2be0875a62 fixes a bunch of unrelated issues (#4329)
* 1

* eye

* more

* maybe

* fix

* fix

Co-authored-by: VM_USER <VM_USER>
2022-08-08 01:46:11 -07:00
ZandarioandGitHub 5a7f357b85 CitadelRP (#4108)
* dme and dmb

* Heeeere we gooo

* fasease

* Continued.

* AAAAAAAAAAAAAAAAAAAAAAAA

* Brain going numb

* agh

* The suffering will be worth it... right?

* Going blank...

* Am I done?

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes

* Should be everything I care about right now.
2022-05-26 01:37:55 -07:00
ZandarioandGitHub cc701aedb6 [Ready?]Machine Code Cleaning and some other stuff. (#4050)
* AutoDoc, bye useless comments, and some flair

* WHEW

* blele

* GLOB.machines

* Funny game

* Forgor

* Appease the linter

* asdasd

* chairs

* asdsad

* asdfasdf

* wuh if

* bruh
2022-05-15 14:41:34 -07:00
siliconsGitHubfake_vm_user <fake_vm_user>
6fbf68f88c [MDB IGNORE] Repaths atmospherics components to be subtypes of components (#4043)
* repath

* that

Co-authored-by: fake_vm_user <fake_vm_user>
2022-05-12 14:41:54 -07:00
crystalandGitHub e7928ae5e1 New knives. New spirits. What could go wrong? (#3846)
* smokeweedeveryday.mp4

adds tobacco-based blunt papers for rollies.

* oops spoliers

deleted work regarding a different PR.

* fucking tab key i swear

removed a tab

* bluntsshouldbeblunt

fixed a bug where blunts would spawn as joints

* knives added

* white rum implementation

no sprites

* Update drinks.dmi

* Update weapons.dmi

* Update drinks.dmi

* fixes issues

* Update vending.dm
2022-04-04 19:12:47 -07:00
Captain277 b0be84ae20 Cigarettes and coffee with the underbelly. 2022-03-20 21:04:56 -07:00
Captain277 e41590d069 SolGov code removal - First Pass 2021-09-22 03:47:19 -07:00
ZandarioandGitHub 9432ea083f Reorganizing Flags and making them somewhat consistent with Main (#3330) 2021-08-14 21:20:41 -07:00
663b919445 [IDB IGNORE] [MDB IGNORE] Tether - remade on cit repo so people can PR to this (#3043)
* Tetherport

* sigh

* more fixes

* shields

* more

* woo

* compile

* e

* a

* Tether, compilable and running

not playable tho

* Tether, compilable and running

not playable tho

* Automatic changelog generation for PR #3200 [ci skip]

* why

* EOL

* nukes edited areas. if you had something important in here, you didn't deserve to.

* another folder down

* one more folder

* the refacotring continues

* change those

* okay

* dynamic zlevels

* move stufF

* reorganize that too

* get rid of unneded archives

* move talon too and rename that

* meh

* woop

* fixes

* move those

* fixes

* fix

* Submap Repathing/Reconciliation

* Attempts to fix Gecko invalid variable bug.

* Alright. Let's actually fix every bugged instance.

* Another round of updates. That same turf issue exists.

* Should fix the last of those weird varedits.

* One snuck by?

* Another round of fixes.

* I want to know who put all these var edits in.

* Another batch down.

* Yet another batch.

* A map at a time, at this rate.

* I hope these are the last four, but probably not.

* Hopefully the last, but probably not.

* ANOTHER stealth var_edit that snuck through.

* Manually checked the rest of the map files I found. These were updated.

* Did the same for bad var_edits. Caught these.

* Updates the 140x140.

* Sorts Talon and partially adds Point Defense. Too complex for me.

* tether_turfs

* I think this is it. The last variable bug.

* Telenetwork Delenda Est

* linterS

* fix

* extraneous files

* woo

* mmm

* add that in until reagents hardsync

* woo

* sync

* updates

* t

* weather

* i want to rewrite telecomms

* test

* shift those

* woo

* move that

* FUCK

* Fix

* fix

* or null

* shuffle

* Fixes

* Fixes

* Fix

* fixes

* woo

* that

* facility safety

* that too

* move that out

* fixes

* woops /

* rename those

* those

* woo

* test

* fixes

* woo

* exploration map edits

changes oxygen tanks to o2 jetpacks, co2 jetpack to an o2, adds pathfinder voidsuit, suit cycler for medical, and fixes access restrictions on the PF's office and locker

* mh

* Update fueldepot.dmm

* woo

* woo

* woo

* fix

* utterly fuck you

* Automatic changelog generation for PR #3225 [ci skip]

* test code

* w

* that

* fieldgens

* better

* singulo

* fixes

* fix

* fix

* adds mirrortools, removes backup implants

* why

* Prevents falling through catwalks and lattice,
stolen from Silicons

* Lots of stuff!

* Update talon2.dmm

* Automatic changelog generation for PR #3226 [ci skip]

* Removes Mining Stacker

* Slight remap changes to Deck 3, pending more.

* Automatic changelog generation for PR #3228 [ci skip]

* fix that

* that

* R&D remap.

* Lighting fix and correcting a talon vault issue?

* Conflict clean-up.

* Multi-floor modifications. Chem change. R&D revert. Etc.

* Adds a few extra timeclocks.

* Missed the bioregens. Hooray.

* Re re readjusts R&D to a lobby design. Adds Space Spice. Maybe fixes Captain spawner.

* woo

* fix

* not that

* Xenobotany and Trash Pit adjustments.

* proper

* De-militarizes Talon. Will Trader-ify them when I wake up.

* fix

* fix

* ashet pls

* ashet pls v2

* cleaner

* cleaner

Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Captain277 <agentraven16@gmail.com>
Co-authored-by: Mag <86886852+MonaraMir@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: TheLordME <58342752+TheLordME@users.noreply.github.com>
2021-07-11 23:29:24 -07:00
siliconsandGitHub 5823fb93e7 migrates to github actions + sync tgui to main's, removes a bunch of dead maps and code and reworks how submap loading is done (#2917)
* move phoronlock define

* t

* force rename

* nuke unneeded things

* don't do that

* tgui sync?

* changes

* unit testing module

* backend

* tools update

* aaah

* go and stay go

* path replace

* move everything

* toss out more stuff

* remove

* fine those can stay

* dependencies.sh

* ruin datum move + rename

* level assets why did you guys put the turfs in my atmosphers folder grr

* more moving

* basemap, force stuff

* fix that desync meme

* move more stuff

* move those too

* repath

* get rid of useless initializers

* hacky patchy

* reservations

* alright

* tgui

* changelog example

* checksum

* md5

* errors

* more

* turf empty

* stop

* fix

* bad kwarg

* let's get those in again

* alright

* rid of that

* huh

* newlines

* newlines

* folder

* mood

* woops

* readme

* might as well trim now

* let's go

* fuck it tether isn't being used anyways lol

* ok

* empty files go

* tether is demoted

* sorry but this goes too

* okay

* make that work too

* ok

* wow.

* whew

* Fix

* fixes

* ok

* sigh

* fix

* fix

* aah.

* rust_g logging

* update rust g file

* fix

* funny

* Fix

* map issues

* fix

* initialize hints

* solves some problems

* those too

* ok

* pills

* let's do that.

* hit that too

* runtime

* add that too

* alright

* fix

* fix

* fix

* Fix

* add

* fix

* wildwest, what have they done to you...

* do that too'
git push

* fixes

* fixes

* fixes

* pack this tightly

* let's not have empty files

* sigh

* fix

* FUCK OFF

* fix icon

* rip old mapmerge

* zz

* woo yeah woo yeah

* logging

* fix

* better logs

* GRRRRRR

* last commit??

* awful
2021-04-01 16:07:03 -05:00
siliconsandGitHub de61aa0fb2 Update engineering.dm 2021-03-26 01:56:47 -07:00
silicons 054cd3b652 holy fuck 2021-02-25 03:19:54 -07:00
lolman360 2b0b4e8895 Verbose examine fix. 2021-02-15 23:11:16 +11:00
lolman360 7dd8143386 fixing icons!! 2021-02-15 13:41:04 +11:00
Captain277 11a9a32bc6 Opening commit for the CCC Update. 2020-05-16 16:09:07 -07:00