Commit Graph

235 Commits

Author SHA1 Message Date
naut
55f4e12614 Codeside Cargo Refactor (#20030)
**NOTE TO SYSADMINS: See "SQL Details" section below for information on
SQL modifications.**

Moves the data containing cargo items (i.e. the ones you order from ops
and get in the cargo shuttle) from the online database to the codebase.
Everything from suppliers to categories to individual items is now
code-side and editable by developers/contributors.

Refactors cargo items to use `singletons` instead of `datums` for
`cargo_supplier`, `cargo_category`, and `cargo_item`. Multiple-instnace
things like cargo_orders, etc. still use `datums`.

Fixed a bunch of strange discrepancies in categories, suppliers, and
pricing for various cargo items. I did a little bit, but it's exhausting
to go through all of it right now.

Clicking the 'Details' button on the Cargo Order app now actually gives
you details instead of bluescreening. Also added some UI elements to the
Cargo Order app - Cargo Control and Delivery remain untouched.

Overhauled the Cargo Order console TGUI window. It now has tabs on the
left, displays restricted access, supplier information, and boasts
search functionality.

### SQL Details
<details>
<summary>SQL Details [Click to Expand]</summary>

The following SQL tables should be deleted or deprecated from the server
database, as they are no longer in use:

- `ss13_cargo_items`
- `ss13_cargo_categories`
- `ss13_cargo_suppliers`

The included migration file, `V011__codeside_cargo`, creates a new table
`ss13_cargo_item_orderlog` to the DB. This **replaces**
`ss13_cargo_orderlog_items`. Because of this,
`ss13_cargo_orderlog_items` is deprecated and should either be deleted
or locked & preserved for logging purposes.

</details>

## Screenshots


![image](https://github.com/user-attachments/assets/79129923-1fb6-4cee-ac8d-5505a52270a4)

![image](https://github.com/user-attachments/assets/a323be35-8ce6-4ec4-98f7-ee701d0931a3)

![image](https://github.com/user-attachments/assets/5ddb02c5-152f-4715-b2da-20903fa11c93)

![image](https://github.com/user-attachments/assets/420e45b0-6a9f-4420-beb8-a2c8423a5be4)

![image](https://github.com/user-attachments/assets/114f4755-ee51-41e6-8670-07aacc5326ae)

---------

Signed-off-by: naut <55491249+nauticall@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2025-03-04 18:18:00 +00:00
Fluffy
3185c10cf1 516 internal links (#20428)
Convert all (appropriate) links to use the required `byond://` for 516

Added a grep to detect incompatible ones
2025-02-20 22:54:10 +00:00
Fluffy
7265630dde Turn more unmanaged global vars into GLOB (#20446)
Turned a ton of unmanaged globals into managed globals.
Refactored some UT output.
Removed some unused things, including vars.
Added a test to ensure people don't keep adding new unmanaged vars.
2025-02-17 23:34:02 +00:00
Wowzewow (Wezzy)
e7232d04fc The Great Device Resprite and Contained Sprite-ening (#20344)
Don't let the large file size scare you, it's just mostly splitting
stuff into contained sprites and putting them in the correct place.

Anyway, resprites most non-resprited devices in devices.dmi, and puts
them in contained sprites.
Also puts any related /obj/item/device into contained sprites too.
That's basically the long and short of it.
2025-01-24 12:16:30 +00:00
Matt Atlas
eb3bc19014 A lot of bugfixes. (#20358)
- bugfix: "Fixed PDAs not being automatically updated by the Force
Change Name admin action."
- bugfix: "Announcements from non-Horizon ships drifting into hazards no
longer spawn observer chat. You will only get the announcements if you
are on the same z-level. The Horizon will still send its announcements
globally."
  - bugfix: "Offships no longer send newscaster announcements."
  - bugfix: "Fixed ling stings not working. Again."
- bugfix: "The robotics core console no longer reverts into a normal R&D
console when disassembled and reassembled."
- bugfix: "The robotics core console now has its own circuit that can be
made through R&D."
- bugfix: "Fixed the message that simple mobs print when they step on a
trap."
  - bugfix: "Fixed the foam sword sprite."
  - bugfix: "Fixed damaged wall overlays."
  - bugfix: "Fixed the INDRA field getting messed up by pointing at it."
  - bugfix: "Apple pies now count for the pie bounty."
- bugfix: "Changeling chameleon claws no longer spawn in the warehouse."
  - bugfix: "Admin click-drag to possess has been fixed."
- bugfix: "Added a minimum damage threshold to delimb, in order to stops
ridiculously small damage from taking off limbs. The threshold is the
organ's max damage divided by 3."
  - bugfix: "The Pull psionic ability no longer pulls anchored objects."

Fixes #17739
Fixes #17369
Fixes #19535
Fixes #19166
Fixes #20184
Fixes #20165
Fixes #20164
Fixes #20117
Fixes #19961
Fixes #20231
Fixes #20277
Fixes #20346

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2025-01-13 22:13:44 +00:00
Geeves
6bc8d93419 Package Delivery Expansion (#20003)
* Cargo delivery packages now have colored tags on them which should
hopefully make it easier to distinguish between them, instead of
changing the entire package's color.
* Delivering a package now outputs another, allowing you to continuously
deliver throughout the round, should you choose to.
* Fixed cargo packages runtiming on the runtime map.
2024-12-24 12:42:03 +00:00
courierbravo
86d7e8237e Melee Toy, Sprites - Dino Grabber (#19900)
Adds a dino grabber toy to the game. It counts as a weapon, and uses
modified whip code to have a chance of disarming people. Its also now in
the warehouse spawn pool as a rare item, with the weight of 1.75. It
should only show up every 2-3 rounds.
Also adds an object sprite and in hand sprites.

---------

Signed-off-by: courierbravo <73250577+courierbravo@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Hazelrat <ric.whe.don@gmail.com>
2024-10-14 19:26:18 +00:00
Fluffy
b8902e2e16 Runtime map now loads in ~11 seconds instead of ~40, sped up various other things (#19957)
Runtime map now has a bunch of new areas / items with often-tested
stuffs, and some hard-to-put-at-runtime stuffs.
Runtime map jobs now are positioned to make it faster to reach the
aforementioned often-tested stuffs.
Runtime map doesn't generate an overmap anymore by default, which speeds
up the process.
Runtime map now loads in ~11 seconds instead of ~40 seconds as it was
before.
Updated the maploader to be faster in parsing maps.
Bapi is not engaged anymore if we're only measuring the map size, which
speeds up the process.
In fastboot we do not generate the codexes anymore, which speeds up the
process.
In fastboot and if exoplanets and away sites are not enabled, we do not
parse the map templates anymore, which speeds up the process.
Updated the icon smoothing to be faster.
Optimized cargo area code.
Other optimizations.
2024-10-06 21:31:01 +00:00
Fluffy
0ae0b10764 Refactored all the backslash ref and ref() calls to use REF() instead (#19847)
Refactored all the backslash ref and ref() calls to use REF() instead.
Added a linting for raw ref proc calls.
2024-09-13 10:17:32 +00:00
courierbravo
a5e0f1f712 The Great Sticker Update (#19867)
Added 79 new stickers. 60 by LforLouise, 1 by Noble Row, 2 by Ben10083,
10 by Hazelmouse, 1 by Mr.Popper, 4 by FabianK3, and 1 by Kermit.
Added sticker sheets, a storage that can only store stickers. Sprite by
Noble Row
Added the new sticker sheets to the loadout menu
Replaced gold star and googly eye boxes with sticker sheets.
2024-09-07 16:32:58 +00:00
Fluffy
b0c9a4649c Speed modifiers (#19845)
Ported and implemented movespeed_modifer, for most things, from TG.
Gave deprecation DMDocs to the old calculation system.
Some code cleanup around.
2024-09-06 22:20:56 +00:00
Fluffy
a3a4d46fa7 Hitby refactor (#19624)
Refactored hitby to be in line with TG's version.
Refactored item weight defines to a more clear naming scheme, also in
line with TG's version.
Refactored how the movement bumps are handled, ported signals to handle
them, in preparation for the movement update.
Fixed disposal hit bouncing the hitting atom on the wall.
Items do not push other items anymore if they are tiny.
2024-07-28 20:52:08 +00:00
courierbravo
ba4d62a5a8 Balancing - Mining materials exports (#19470)
Added the ability to sell off your mining materials for profit. All
prices are relatively low, so it shouldn't mess up the balance of things
too much.
Consequentially, engineering can now sell its gold, silver, and platinum
to operations.
Also, I removed market elasticity from this materials list. Just to make
things far more consistent, and remove any potential and needless
frustration.
Thank you to @BoomerThor for helping me through this!
2024-07-17 21:11:36 +00:00
DreamySkrell
ef018f8b30 OX courier package reflavor (#19430)
![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/dc14bf59-a321-45d7-acb1-12dbb8e9af18)

![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/a49bdb7f-67e5-41ec-81ac-c0b13c7b0d58)

Co-authored-by: DreamySkrell <>
2024-06-26 10:16:00 +00:00
BoomerThor
93ab1c9791 Cargo additions, bugfixes and changes (#19438)
Operation Managers and Hangar Techs were supposed to always have the
Cargo Control program downloadable, but it was access-locked behind HOP
(which has been changed to executive officer). I also gave the program
the ability to run on laptops, so cargo techs actually have a reason to
bring a laptop.

Fixes some cargo bounties that were bugged (including #17225) and
removed some that cannot be fulfilled. Smoke grenades were removed from
security, machinists can't print the Telecomms Traffic Control board,
science can't print NVGs anymore, and there is no way in-game to produce
monkey hide.
2024-06-16 15:22:03 +00:00
Fluffy
3dc4cce9c2 Minor span refactoring (#19177)
Minor span refactoring
2024-05-19 16:37:29 +00:00
Fluffy
83891924ab Gas nades bounty fix (#19115)
DMDoc'd the vars of /datum/bounty/item.
All the two types of gas grenades are now allowed for the gas grenade
bounty.

Fixes #19064
2024-05-12 18:56:08 +00:00
RustingWithYou
f3f802b372 Uueoa-Esa, Part 7 - The Wasteland (#19014)
Adds several ruins for the Wasteland.
2024-05-06 14:56:24 +00:00
DreamySkrell
7d67044010 More muffins (#19038)
momev update


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

momev update

---------

Co-authored-by: DreamySkrell <>
2024-05-01 22:36:14 +00:00
Cody Brittain
9983fca311 Update SSOverlays (ported from Baystation) (#19051)
Our SSOverlays system is outdated, and is likely the cause of many of
the issues seen in #18895. It has also been linked to a massive server
performance decrease.

This brings an updated system from Baystation, hopefully with speed
increases.

Should be testmerged, ideally with #18895.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-01 07:46:27 +00:00
Fluffy
7a28cc1883 More optimizations (#18987)
Removed a background set.
Refactored away some world loops.
2024-04-22 11:47:23 +00:00
Fluffy
ab23fbdb70 Function overloads condensation (#18939)
Unified most of the procs into one definition, so there are no duplicate
around the codebase.
Marked some of the above as overridable if a good enough case can be
made for them (eg. external dependency or unlikely to be used).
2024-04-19 21:19:41 +00:00
smellie
11f8eff319 Cryonics Additions + IV Bag Stuff (#18415)
### Summary:
This PR fleshes out cryonics, both inside a cryotube and outside of a
cryotube, and gives a pharmacist a lot more to do during those high
energy rounds as they will be required to prepare and oversee any
cryonic mixes. Lots of ways you can go about doing with the biggest
reward being brain regeneration that bypasses oxygenation requirements,
at the cost of significant downsides if done improperly.

This generally empowers pharmacists and physicians and offers
non-surgical treatment alternatives, though often incurs a penalty or
takes a little longer than surgical treatment, so it doesn't make
surgeons redundant.

This list'll be exhaustive so medical players aren't left in the dark
and can just refer to this while a wiki update is worked on, instead of
digging through code.

 **Changes to Stasis/Cryotubes:**
- Stasis at temperates between 120K and 200K has been reduced to between
5 and 10, as opposed to 10 and 20. This means chemicals still have a
good chance of metabolising if you set a cryotube to above ~140K.
Cryotubes will still achieve good stasis if you cool below 120K -
upgraded stockparts from the workshop/R&D will help with this.
- (Bugfix) IPCs will not longer be knocked unconscious if they enter an
active cryotube.

**Misc. Reagent Additions/Tweaks:**
- Bicaridine now only requires 30u in the blood to begin attempting to
repair arterial bleeds, as opposed to 50u.
- Adds a Blood Thinning chemical effect. This prevents Coagzolug's blood
clotting effect from working and works in the opposite way - increasing
how much blood you lose per blood loss tick. Fluvectionem and
Synaptizine apply Blood Thinning at a strength of 25, translating to 25%
faster blood loss.

**Cryonic Chemicals:**
- Cryoxadone and Clonexadone both overdose at 5u. **_This is not a
problem when using a cryotube due to how cryotubes administer
reagents._** Overdosing either results in genetic damage and severe eye
damage.
- Cryoxadone and Clonexadone's organ healing capabilities have been
significantly nerfed. The organ healing is still noticable and useful
for pharmacist/surgeonless rounds; they cannot heal the brain though.
- Cryosurfactant has been renamed to Cryosilicate, mimicking
Pyrosilicate - the recipe now uses silicate instead of surfactant.
- Cryosilicate and Pyrosilicate now have an effect when used in the
body: cryosilicate will supercool a patient; pyrosilicate will
chemically incinerate someone. Leporazine will inhibit these functions.
- Bicaridine will repair arterial bleeds when used in cryogenic
conditions.
- Kelotane will repair disfigurement when used in cryogenic conditions.
- Peridaxon 2x effective in cryogenic conditions. Peridaxon can
denecrotise livers and kidneys in extracool cryogenic conditions - it
cannot denecrotise other organs. Using peridaxon in cryogenic conditions
will result in benign tumour growth (see below).
- Red Nightshade can repair bone breaks in cryogenic conditions. It will
still put a patient into a berserk state.
- Cataleptinol - see below.

**Cataleptinol Rework:**
Cataleptinol has been reworked from the ground up and is where
pharmacist's will be able to shine by making fancy cryotube beaker
mixers or cryonic mixtures for use in IV stands.
- The new recipe is 2 parts Alkysine, 0.5 parts Phoron, 1 part
Clonexadone and a 5u Cryosilicate catalyst. This translates to: 120u
Alkysine + 60u Clonexadone + 30u Phoron w/ 5u Cryosilicate = 60u (1
bottle) of Cataleptinol - expensive and lots of tricky precursors,
leaves enough left over to make a 2nd bottle without having to remake
all of the precursors.
- **In cryogenic conditions**, Cataleptinol will restore 7.5% brain
activity per metabolisation tick. This _bypasses the 85% oxygenation
requirement_, at the cost of hallucinations, blood thinning and liver
damage. The trade is roughly 40% brain activity (assuming nothing is
causing brain damage) for total liver failure.
- **Outside of cryogenic conditions**, Cataleptinol becomes a lot less
reliable and a lot more dangerous to use, with only a 75% chance of
restoring 2% brain activity per metabolisation tick. It will still
bypass oxygenation requirements, making it useful during _**severe
emergencies**_, at the cost of inducing painshock in addition to the
above hallucinations, blood thinning and liver damage. The trade is
roughly 25% brain activity (assuming nothing is causing brain damage)
for total liver failure.
- Cataleptinol _**overdoses at 3u**_ and has a fast metabolisation of
0.6u/tick - this makes it hard to dose without using an IV drip. If you
overdose Cataleptinol by using another method of administration, then
the patient's liver will crash, brain regeneration undone and the
patient will have severe seizures resulting in more pain. Using
Cataleptinol outside of cryogenic conditions **is high risk and only
potentially high reward**, but it could buy a couple more minutes.

**Tumours:**
- Adds Benign Tumours. Benign tumours simply drain nutrition and cause
frequent pain; they do not spread or affect nearby organs.
- Adds Malignant Tumours. Malignant tumours will begin by draining
nutrition then effecting symptoms based on the tumour's location (chest
tumours -> coughing, gasping, chest pain; brain tumours ->
disorientation, memory loss; abdominal -> vomiting, abdominal pain;
anywhere else -> lethargy). In the later stages, malignant tumours will
begin to damage the organs they are close to, then will eventually enter
the circulatory _~~and lymphatic~~_ system and spawn more malignant
tumours in other parts of the body.
- Peridaxon will result in benign tumour growth when overdosed or used
in cryogenic conditions.
- Genetic damage will result in malignant tumour growth.
- Ryetalyn is the anti-tumour drug and will put both benign and
malignant tumours into recession. You can also surgically intervene and
excise tumours as you would k'ois mycosis or fluke parasites.
- You cannot have more than 3 of any tumour - things won't get too out
of hand.

**IV Bag Stuff:**
- Adds 2 labels for IV bags: Cryonics Mixture, denoted by a CR; Other
Mixture, denoted by an M.
- Renames `blood packs` to `IV bags` and changes their formatting. What
was `blood pack O+` will now appear as `IV bag - O+ Blood`; `blood pack
Saline Plus` -> `IV bag - Saline Plus`.

**Misc.:**
- Only 20 genetic degradation on a limb is required to deform it instead
of 30. This should make it slightly more common, as 30 is a large number
to reach when this number is calculated per limb.
- Seizures can be given variable strengths.
- (Bugfix) Coolant tanks no longer just set a room's temperature to 0K
when destroyed. The amount it cools a room scales with the amount of
coolant still in the tank but cannot go below 173K/-100°C.
- Cryocells now have stockparts and can be upgraded/deconstructed.
2024-04-13 16:14:51 +00:00
Avery Marie
fe14d644e4 Random Contraband and Cargo Lists Tweaks (#18799)
This PR does the following. 

- Removes Heroin, Cocaine (and it's subtypes), Raskara dust, and all
other Tier-1 drugs in our drug list (excpet from the Cargo reagent
spawner.

- Adds more contraband to the contraband loot table. For example - 
- Cocaine, Heroin, 9mm pistol, derringer revolver, sawn off shotgun
(improvised), paralysis pen, and the poison pen. I also added auto
injectors for drugs that are not in pill form, like imprednezene(?),
stimpack, beserk, and nightlife.
         
- Adds more contraband map spawns in maintenance areas. I believe it
adds 5 or 6 across all three z-levels in areas like the abandoned bar,
the poker table, a table in maintenance by science, the maintenance
under the bar, etc. The map diff bot will show. These are not always
guaranteed to spawn either upon my testing. I'm not sure why, but it
works better this way imo.

- Removes ambrosia and other non-contraband drugs from the loot table
for now.

If requested, I am open to adding one or two custom contraband spawners
for the brig. Just ask in the PR's comments.

---------

Signed-off-by: Avery Marie <98699252+Eyeveri@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-04-05 22:30:23 +00:00
Matt Atlas
fec6dbe24f Adjusts the force of all items to be multiplied. (#18708)
* force balancing?

* force

* cl & maglight nerf

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-03-24 17:10:31 +00:00
Matt Atlas
82beece3db Backports the new zombification mechanics from the Konyang zombie event. (#18710)
* Reorder parasites

* sounds

* organ defines, dmdocs

* maiming stuff

* undead changes, abilities

* hylemnomil, undead sprites

* antibodies

* antibody extractor code

* icons

* antibody fixes

* antibodies vial, rock break sfx

* You're all going to die down here.

* hylemnomilz eta vial and attributions

* zombified organs can't be removed

* hylemnomil zeta edits

* fixes

* lmao

* easier check

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-03-24 14:04:52 +00:00
Andrew
50ba56174a Condensed laser scalpels into a single version (#18697)
* Condensed laser scalpels into a single version

title

* Remove unused laser scalpel icons
2024-03-23 17:24:41 +00:00
Fluffy
cf056641d3 dgdsg (#18575) 2024-03-03 19:52:57 +00:00
Ben
2977912fbe Point Verdant Delivery Points + Long Range Holopad in Cells + Konyang Police Fax + Police Speedloader fix + L + Ratio (#18531)
* Point Verdant Deliveries

* Holopad Police

* Refactor code

* Variables applied

* Spawn Limits

* nicer

* Fix bug (hopefully)

* Document

* Maptweaks + bugfix

* spell

* typo

* Bugfix

* no spaces

* Extra Document

* oops

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-02-29 17:39:10 +00:00
tomixcomics
3850d6c52f New food as well as updating lasagnas and pancakes (#18412)
* added a bunch of things

* updated pancakes

* more updates

* updated bounty, made changelog
2024-02-17 20:06:30 +00:00
Fluffy
9afe761db3 Some refactors, DMDoc and UT (#18365)
* dsfa

* accessories fix

* fixed "has been hit by" message with intent check

* sdfa
2024-02-12 15:32:23 +00:00
Matt Atlas
4423d03f2f Adds examine boxes. (#18370)
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-11 21:58:20 +00:00
Fluffy
25dc248979 Updated statpanel and added client pings (#18337)
* SSatlas.current_map

* hardsuit spell tab appears to clear correctly

* sdfsa

* from the moment i understood the weakness of my flesh, it disgusted me

* sdf
2024-02-08 12:29:42 +00:00
feartheblackout
55ee28acf4 Passive mobs no longer spawn in the Warehouse (#18260)
* Passive mobs no longer spawn in the Warehouse

* changelog

* ChangeMe
2024-01-30 10:55:50 +00:00
Fluffy
ca6b04e1d7 Updated SSgarbage (#18173)
* pain

* sadfas

* sdfa

* sdfasf

* sfa

* sdf

* might the lord have mercy on our soul

* i cri everidai

* adeste fideles

* sdf

* where will this lead, what's coming next, from your inventions

* dear lord

* gjvhk

* i cri everidai

* fsgf

* sdfa

* sdaf

* hiuhi
2024-01-15 14:08:27 +00:00
Wowzewow (Wezzy)
aa7af3e370 walter (#18165) 2024-01-09 21:10:11 +00:00
tomixcomics
5e95fa42b6 New foods and drinks, tweaks/updates to old food. (#18140)
* first commit

fixed wooden platter sprite
fixed error in bounty phrasing
created recipe for hash browns
replaced flat dough in doner kebab recipe with a pita
made it so muffins are made in larger batches, and each muffin is less filling seperately
created 7 new kinds of milkshake
changed some incorect capitalization
made it so bread that's been eaten no longer creates leftover plates
updated ravioli code to fit with correct format
updated ravioli to be more filling.

* Roast chicken and River Loaf

created roast chicken and river loaf

* changleog

* corrected changelog

* updated food bug

* grammar update

updating capitalization

* updated bowl pickup ability

* code update
2024-01-09 17:11:55 +00:00
4000daniel1
0170916240 Allows the toy guns that spawn in the warehouse to also spawn as real guns (#18081)
* g

* cl

* ooops
2024-01-07 02:56:56 +00:00
DreamySkrell
fc1c2fcf5d a (#18054)
Co-authored-by: DreamySkrell <>
2023-12-27 16:39:40 +00:00
Matt Atlas
cadd19beac Ports the TG globals controller and converts globals. (#18057)
* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* Port the /TG/ globals controller.

* part 1

* part 2

* oops

* part 3

* Hollow Purple

* sadas

* bsbsdb

* muda na agaki ta

* ids 1-15

* 16-31

* 41-75

* bring me back to how things used to be before i lost it all

* the strength of mayhem

* final touches

* cl

* protect some vars

* update sdql2 to use glob

* stuff?

* forgot that is not defined there

* whoops

* observ

* but it never gets better

* a

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-26 01:16:02 +00:00
Geeves
25adf63bc7 Courier Expansion (#18002) 2023-12-24 02:20:34 +00:00
Geeves
d7db1f6d4a Orion Express Courier System (#17952)
* Orion Express Courier System

* tweaks and fixes

* whoops this goes in the back

* cement das conk creet baybee

* while funny, fixed supplies count

* add support for non-overmap tests

* guh

* anotha one

* feedback

* remove unused imports
2023-12-19 11:45:39 +00:00
tomixcomics
3807930fe6 Adds Several New Foods (#17759)
* broke game while working on update, halp

thanks tech support

* Update code/modules/reagents/reagent_containers/food/snacks/soup.dm

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>

* Added more foods, still WIP

* updating things to see where the bgus are coming from

triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say.

* trying to fix triolade and palfouz

* code giving trouble

* finally fixed the issues! woo!

* Got almost everything done and working!

only pitas are left :)

* Final update!

-Added a whole lot of recipes
-Fixed a whole lot of bugs
-Fixed V'krexi wraps from a previous update
-Updated some icons
-Let's submit this thing!

* Adding changelog

Woo, changelog!

* Update Tomixcomics-PR-17759.yml

Whoops, missed a typo.

* trying to solve issues

* fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now.

* Update code/game/objects/items/trash.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/recipes/cultural/recipes_human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/sandwich.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* small fixes

deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation

---------

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-12-01 12:13:46 +00:00
Acetrea
988f4d146a NT Muffin Sprite Fix (#17801)
* NT Muffin Sprite Fix

Fixes the NT muffin sprite issue

* Remove spaces from changelog

* Fix cargo bounty

* NT Muffin Sprite Fix

* mapfix
2023-11-27 23:19:37 +00:00
Cody Brittain
06601c9ec3 Split up and rename var/flags (#17794)
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:27:51 +00:00
Fluffy
c25c8b6a37 Last editorconfig fixup (#17782)
* one

* two

* three

* fsdsdf
2023-11-20 18:22:42 +00:00
Tag114
0975553bb2 Removes various mentions of the Syndicate, labels "Nutri-Cakes" as an improper name (#17629)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Changelog

* Add files via upload

* Changelog edit

* Changelog edit

* changelog edit

* Changes supply console names for red space suit and helmet

* Changes stealth armory dropper name to "Tactical Autodrone"

* Makes trash nutri-cakes improper

* Makes food Nutri-Cakes improper

* Changelog update

* Add files via upload

* Add files via upload
2023-10-26 14:19:30 +00:00
Cody Brittain
4e2b58f02a Added new drugs from lore and otherwise (#16773)
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

Update code/modules/hydroponics/seed_datums/smokables.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-20 17:55:13 +00:00
WilliamMurdoch
8f0477cf6e Better Coffee Recipes (#17546)
* Coffee

* Rename cafe latte sprite

* Forgot a few things, woops

* Last time I need to change cafe to caffe

* There was apparently a call for cafe latte here

* Wrong changelog location

* Revert "Wrong changelog location"

This reverts commit 4294b4ca2b.

* Adds steamed milk, changes the recipes again, roast coffee beans
2023-10-14 10:27:57 +00:00
Matt Atlas
e292b645ea Carpotoxin can no longer spawn in the warehouse. (#17597)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-14 10:08:21 +00:00