69 Commits
Author SHA1 Message Date
Cody BrittainandGitHub 3f62424312 [MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.

---------

Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
2026-02-01 05:14:26 +00:00
nautandGitHub 8888834897 The Orion Miner + Shuttle Standards Expansion (#21491)
Adds the **Orion Miner** (officially the **Orion Mining Skiff**), an
all-in-one mining mega-shuttle with landing capability. Yes, the entire
ship can land. There is no secondary shuttle to get into.

<img width="704" height="1408" alt="image"
src="https://github.com/user-attachments/assets/b58d1305-2dbd-4c20-9305-f88535522af2"
/>

The Orion Miner is intended to be a lowpop (or solo, if necessary)
mining experience for people to try their hand at mining and exploration
without being critically dependent on other departments for
functionality. If you like mining, often go on low-pop and/or dislike
having to rely on other staff (medical/engineering/etc) for basic
necessities, this ship is for you!

Miners have their own supplies, access to thrust, navigation, and
equipment slightly better than that of the Horizon to compensate for
lack of support. This includes medical equipment and lifesaving
medication, in theory making solo miners on this shuttle statistically
less likely to die of preventable causes like blood loss or lung
ruptures.

While this ship can be crewed by a single person if necessary, it has
space for 4 crew total: 3 fully-equipped miners, plus 1 crewmember or
technician. (They are also provided an EVA suit and can use extra
equipment as necessary). This ship does not come with an explicit
captain.

Ore redemption consoles and mining equipment vendors are also present to
give crew the full mining gameplay loop. Minus the sales, at least -
though you could absolutely sell off or give away your spoils to the
Horizon or other offships if you so desired.

## Ship Features
- Full docking and landing capability. The ship _is_ the shuttle.
- An ore smelting plant and cargo bay.
- Ore redemption consoles and mining vendors, for the full miner's
gameplay loop.
- A Grauwolf for hazard clearing and (secondary) self-defense.
- A canteen and kitchen with adequate supplies.
- A hydroponics bay.
- Three atmosphere-rated airlocks. The rear one (north of the shuttle)
is a docking port.
- Emergency treatment-capable medical bay with adequate medical
supplies. It's no Horizon, but it is capable of saving people from
otherwise ruinous injuries.
- Technical storage and main engineering.
- Full SCC corporate affiliation. As a ship of Orion Express, this ship
can and should be able to interact (and possibly partner) with the
Horizon without a hitch.

## Additionally...
This PR also comes with a minor refactor to the way ore processing
machinery works: code has been streamlined, redundancies have been
eliminated, and machines should now work properly even when moved in
space (for example if it is on a shuttle).

<img width="991" height="351" alt="image"
src="https://github.com/user-attachments/assets/8f99dc29-8927-40e0-9856-b8ad5b2d35cb"
/>

This PR also comes with a minor resprite to the `sleekstab` sleek
stabilization kit. It is basically a recolor of the "small first aid
kit" combined with the stabilization kit's rainbow pattern. See
IconDiffBot for the raw sprite.

And last but definitely not least, this PR expands Odyssey landing zones
to accomodate larger shuttles and expands shuttle standards to be bigger
(45 tiles long).

## Notes
<img width="1292" height="936" alt="image"
src="https://github.com/user-attachments/assets/dbcb0f3e-6509-4ff4-a53c-90f1255e6152"
/>

This is an **oversized** shuttle, about 30% larger than the Intrepid by
size and 20% larger than the Lone Spacer. While tested with many, many
different away sites, stations, and exoplanets, including the Horizon
(which it _can_ dock with), it's not guaranteed to be able to land at
_every_ site nor is it guaranteed to do so safely.

_Do note that this size comparison picture uses an old version of the
ship._

## Pictures

_Pictures may not be fully representative of the final design. See
MapDiffBot or the attached map screenshot at the top of the PR for the
final design._

<details>
<summary>Details</summary>

<img width="1316" height="1310" alt="image"
src="https://github.com/user-attachments/assets/fc58c3a8-6c61-41d7-9e69-9852986c76ca"
/>

<img width="1172" height="1111" alt="image"
src="https://github.com/user-attachments/assets/eb3d9d38-b7e5-42a4-88b1-310ff08a1c5d"
/>

<img width="1209" height="1151" alt="image"
src="https://github.com/user-attachments/assets/d1b1842e-f2f7-4525-a5e5-8d6f8c26f9be"
/>

<img width="1251" height="1253" alt="image"
src="https://github.com/user-attachments/assets/cd2b7a40-cb3f-4151-9057-7dc9dfe69ddd"
/>

<img width="1105" height="1198" alt="image"
src="https://github.com/user-attachments/assets/1ae5a5e3-ba73-433f-8186-0c24a77dcade"
/>


</details>
2025-11-11 16:29:19 +00:00
SleepyGemmyandGitHub 6efd5540b9 First-aid Kit Define (#20874)
this PR changes the first-aid kit to use a define in the code. no player
facing changes.
2025-06-23 16:31:45 +00:00
hazelratandGitHub 3198e4e9ea Additional hydroponics QoL + additions (#20836)
This implements a bunch of little QoL improvements and a few substantial
expansions in hydroponics intended to deepen the job's interactions with
hydroponics mechanics.

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


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


![image](https://github.com/user-attachments/assets/f04a2480-7643-4d49-a46f-610f8495e691)
2025-06-22 18:08:56 +00:00
Wowzewow (Wezzy)andGitHub f046ebe584 Borg Bag Fixes and Refactors (#20578)
Fixes #19603
Fixes #20558

- bugfix: "Fixes plant bags - now uses storage_slot system, along with
other bag subtypes."
  - bugfix: "Borgs can interact with tables again."
  - refactor: "Refactors make_exact_fit to be a binary variable."
- refactor: "Refactors storage items to use make_exact_fit instead of
arbitrary max_storage_space values."
- refactor: "Refactors storage items to use defines for storage space."
  - bugfix: "Fixes monkey cube boxes having superfluous overlay."
  - rscadd: "Updates the progress bar toggle message."
- qol: "Objects that rotated 90 degrees in storage no longer rotate in
storage slots."
 
<img width="732" alt="dreamseeker_qRVkIlYN78"
src="https://github.com/user-attachments/assets/1226ed22-52c1-4965-a1b4-2290e56a2ab3"
/>
2025-03-12 09:12:27 +00:00
0c3e762d93 Basic First Aid Kit Changes (#20187)
Changes the contents of first aid kits.

* Antidexafen pills replaced with inaprovaline pills
* Emergency autoinjector added
* Health Analyzer removed

This PR when coupled with #20194 _negligibly affects the number of
health analyzers actually available to the crew and offships._ Any
non-medical personnel that previously relied on access to health
analyzers will in almost every case still have access to them. The
removal is being done to keep the number of analyzers on the map
similar, while increasing the accessibility to stabilization supplies.
If this change is not made, with #20194 there will be over a dozen more
analyzers floating around the ship, which is unwanted by the developer
team. This **_only affects the basic white square medkits._**

If you find any spots where a shuttle or ghost spawn no longer has
access to any form of scanning, let me know in the comments of #20194 so
I can add the analyzer or an alternative there.

---------

Signed-off-by: OolongCow <61329630+OolongCow@users.noreply.github.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2024-12-03 12:43:03 +00:00
FluffyandGitHub 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
9b7138ba05 Medkits can now only hold small-sized items. (#17583)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-13 21:49:50 +00:00
nautandGitHub 7276aedde8 New medkit and trauma pouch sprites (#16744)
* New first aid kit sprites

* Kit map changes

* Inhand sprites + combat kit correction

* changelog

* retcons

* Coding and description tweaks

* szsz

* New-new first aid kits

* removal

* handle removal
2023-07-19 14:29:19 +00:00
Wowzewow (Wezzy)andGitHub 12ddd59fa9 Adds Medpouches (and other Bay Stuff) (#15505) 2023-02-08 11:27:55 +01:00
SleepyGemmyandGitHub 836818d104 Clarifies Bone Repair Options (#14985) 2022-11-03 13:39:21 +01:00
SleepyGemmyandGitHub e5b04475de Adds Marooning Equipment (#14630) 2022-08-22 13:52:33 +02:00
Wowzewow (Wezzy)andGitHub 15218a7ed5 Surgery kit fix. (#14494) 2022-07-27 18:19:51 +02:00
Wowzewow (Wezzy)andGitHub 9ca13871fe Baby Got Back(Packs) (Resprites and sorts storage.dmi) (#14342) 2022-07-10 08:35:57 +02:00
sadkermitandGitHub 79372075e8 Recreational Drug & Toxins Tweaks & Additions (#13129)
This took way too long.
2022-04-08 16:38:18 +02:00
GeevesandGitHub d75c99fbdf Stacking Die (#12929) 2022-02-02 17:13:06 +01:00
Casper3667andGitHub fde83931df Adds prescription to loadout (#11651) 2021-04-21 12:24:37 +02:00
GeevesandGitHub ae2a3b4171 Coagzolug (#10604)
Added Coagzolug, a blood coagulation chemical created by mixing tricordrazine and cough syrup. It will slow bleeding, even arterial, while in the bloodstream.
    Added Coagzolug autoinjectors to mining brute packs and the EMT stabilization kit locker.
2020-12-26 12:19:48 +02:00
sadkermitandGitHub d8e7edc931 Chemistry Update Tweaks/Fixes (very overdue, sorry) (#10102) 2020-10-01 01:45:23 -03:00
HockaaandGitHub e636c47767 Various RMT pill tweaks + bugfix (#9914) 2020-09-08 14:02:04 +02:00
Wowzewow (Wezzy)andGitHub 307c214541 makes w_class use defines (#9848) 2020-09-06 17:37:56 -03:00
sadkermitandGitHub 36dc8a5220 Chemical Improvements & Tweaks: Side-effects, overdoses, and more. (#9708) 2020-09-01 14:29:40 +02:00
Chada-1andGitHub d7e680a575 Full rename of all real chems to bone apple tea'd versions. (#9400)
As a continuation of #9389
As a bonus, any drugs that mentioned their IRL counterpart in their description now describe their predecessor as ancient, and the new ones as modern. The biggest difference here is just the Antihistamine which was given a full new name. They're similar enough that they'll be recognized (most of them) but different enough for us to call our own and not care what the real medicines are/do since these are our sci-fantasy versions just inspired by them.
2020-07-26 13:19:41 +03:00
JoshieandGitHub fb8af14858 Renames all instances of "Norepinephrine" to "Inaprovaline" (#9389)
It was a mistake to use real life chemicals on the grounds of "realism", especially when the chemical doesn't actually act realistically to how it does in real life. With the removal of the Inaprovaline medication as well, we can return the name to Norepinephrine, which was originally called Inaprovaline anyway.
2020-07-21 17:57:44 +03:00
GeevesandGitHub 33ad8096fb The Great Spanning (#9320)
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
2020-07-12 15:53:28 +03:00
Wowzewow (Wezzy)andGitHub fad8415a8e Pickup, Drop and Equip sounds (#8861) 2020-05-22 15:40:00 -03:00
Wowzewow (Wezzy)andGitHub b9b42f4f8f Janitor, hydroponics and medical inhands (#8456) 2020-03-21 13:36:49 +01:00
WernerandGitHub cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Matt AtlasandErki df0cd6189a Brainmed Update (#7502)
gamer time.
2019-12-10 20:41:15 +02:00
WernerandGitHub af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
alsoandanswerandErki 5b72c2a074 Pill bottle update (#7121)
shamelessly stolen from bay, clicking pillbottles in hand will allow you to pour one out into your offhand.
2019-10-10 16:35:33 +03:00
fernerrandErki 2a2cc7d52e Ports table item autoalign from Bay (#6946)
Made it so items get their pixel x/y reset on pickup.
    Thrown items now also get their pixel placement slightly randomized.
    Tweaked the center of mass on a boatload of items to be more accurate to their sprite art.
    Replaced a bunch of randomized pixel placement code into a unifying proc; randpixel_xy() that uses an item's randpixel var.
2019-09-08 22:51:49 +03:00
MarinaGryphonandErki 68dd51121c Makeshift Chemistry and Medical (#6618)
Skull is fucking CRYING right now.
2019-07-26 11:57:05 +03:00
alsoandanswerandWerner 4d83d1a568 Sound fixes again (#6467) 2019-05-19 16:23:13 +02:00
AlberykandErki 4d703e4f4d Bugfixes: offworlder rigs, vaurca boxes and dionae flares (#6224)
-fixes #6170
-fixes #6216
-fixes #6218
-fixes #6198
-fixes #6060
-fixes #6058
-fixes a hardsuit related runtime
-makes masks less expensive on the loadout

The offworlder rig is now a loadout option, while they get pills by default.
2019-03-27 23:09:31 +02:00
AlberykandWerner 97bcd70b1a Adds Off-Worlder Humans (#6078) 2019-03-13 00:59:04 +01:00
BurgerLUAandWerner b934e1a5f0 Chemistry Map + Equipment Improvements (#5633)
Remapped Chemistry a bit to include more missing equipment, as well as to make it more spacious and less compact. AutoInhalers and autoinjectors were added to the chemistry locker. Most of stuff found in chemistry was added to the chemistry locker for space reasons. Medical belts can now store inhalers and inhaler cartridges. Same with the smartfridge.
2018-12-10 23:34:29 +01:00
BurgerLUAandErki aad698be53 Mental Medication Additions (#4648)
The less controversial tweaks
Tweaked the metabolism rate of mental medication to reflect their intended values. Reduced the dosage threshold to suppress traumas to reflect their intended values.

Syringe (drugs) now contains truth serum.

Cardox is now slightly poisonous, and can directly remove phoron from blood when consumed. Cardox can now remove phoron in the air when applied to turfs.

A secure box of loyalty implants, hextrasenil pills, and cardox grenades are now located in the vault.

The vault now contains some misc emergency gear that a head of staff can access in case of a dire situation. Current gear are loyalty implants, expensive cardox grenades, and Hextrasenil pills.
2018-05-13 17:39:56 +03:00
AlberykandErki 207608b60c Ports some sounds from baystation (#4675)
This pr ports some sounds effects from baystation12, it has sounds for:

-using medical items
-using hyposprays
-opening some storages, like briefcases and toolboxes
-lighting matches
-magboot activation sounds
-holster sounds
-tape sounds
-pen and stamp sounds
2018-05-02 00:20:56 +03:00
BurgerLUAandErki 902173f22b Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)
Overview
With the new implementation of Brain Trauma, I find it would be best for the antidepressants to include some relation to it. Obviously, Lord Fowl was away ahead of me and implemented them in the update already, but not the way that I would like it to be implemented.

Antidepressants
Currently, taking antidepressants suppress brain trauma conditions, however the suppression of brain trauma is not relative to the strength and dosage of the medication much like actual antidepressants. This proof-of-concept update now introduces a framework that factors in the dosage of the medication when it comes to applying or removing brain trauma effects, as well as adds harsher penalties for missing dosages which are relative to your regular dose.

Additional antidepressants are added to the update. Antidepressants are no longer a "one pill cures all" but many pills that cures 1-4 things. There are also two additional medications that act as some sort of loyalty pill, and a pill that acts as a disloyalty pill. The messages for the disloyalty pill only express rebellious nature, and isn't meant as a pill that gives an excuse to antagonize.

The following brain traumas are no longer cured by pills:

Dumbness
Gerstmann Syndrome
Cerebral Near-Blindness
Mutism
Cerebral Blindness
Paralysis
Narcolepsy
Discoordination
Aphasia
Smoking Cigarettes and Cigars
All cigarettes and cigars have a tobacco and nicotine reagent. These reagents slowly deals minor organ damage to certain organs while acting as a very mild painkiller, antidepressant, and stimulant. Like before, cigarettes can be injected with additional medicine, however the medicine is applied over time while you're smoking it, instead of all at once. Custom cigarettes can be made in the biogenerator, our found elsewhere, and can hold up to 15 units of reagents.

Breathing
Breathing emotes are played every second. Before, being in a smoke cloud would force you to "eat" the smoke. This update fixes it so that the smoke is breathed in instead. Currently, there isn't really any change, but it adds potential for new reagent effects such as inhalers or gassing people properly. If you have a mask with internals on, you're immune to the effects.

Additional Changes
Most reagents had no effect if they had less than 0.01 metabolism. This update fixes that so that most reagents can metabolize at less than 0.01. Painkillers and other special reagents still have a similar cap.

Discussion thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=10261
2018-03-25 21:51:27 +03:00
Lohikarandskull132 c077b12899 Convert storage objects to initialize (#2850)
changes:

Converted storage objects to Initialize().
Removed timer from storage New/Initialize in favor of LateInitialize.
Removed some pointless src from storage objects.
Fixed GC of some screen objects used by storage objects.
Changed storage objects' filling to be done by fill() instead of New()/Initialize().
Medkits actually work this time!
2017-06-28 23:09:59 +03:00
LordFowlandGitHub 3c64b62c27 New Map Mining (#1935)
* Alpha Commit

* Alpha Commit

* Seconds

* Some Commit

* Final Commit

* Fixing minedrone synth ID

* Dance Fever

* Fixing Travis part 1

* Satisfying the demands

* Stuff

* Sub-final commit

* Sculpting update

* more sculpting. pr is 99% sculpting, in fact

* kkk

* brightness_off

* swjaugyuwvhuw
2017-03-22 18:14:37 -04:00
LordFowlandskull132 13ac6c9351 Plenty'o'fixes (#1478)
Nerfs blob rollercoaster of death by making it so that blobs cannot interact with the mobs inside of other blobs.
Replaces blob's gibbing mobs with husking humans, merely killing borgs, and gibbing everything else.
Makes flamethrowers modestly more effective versus blobs - a consistent source of minor AoE damage.
Makes blobs more aesthetically pleasing.
Distinguishes the main core from the aux cores slightly more.

Fixes #1426
Fixes #1427
Fixes #1432
Fixes #1461
Fixes #1464
Fixes #1471

Modifies BFG's to be more like actual BFG's.
Fixes Industrial IPCs being able to select Baseline IPC screens.
Fixes several baycode company names to fit ours in guns. Changes several of our guns to fit Baycode's naming paradigm.
2017-01-09 01:04:36 +02:00
skull132 ee68f3c9d0 Final merge
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00
NanakoACandskull132 b5e554812b Cargo Warehouse Stock (#1045)
This PR is intended to make working in cargo more interesting, and more like a real warehouse experience. IE, the place is an aladdin's cave full of wierd knicknaks and useful oddifies.
2016-10-26 18:56:35 +03:00
RavingManiac b405c575cf Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-11-19 14:45:30 +08:00
PsiOmegaDelta fd03e4d59b Surgical kits can now contain their equipment.
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
2015-10-15 10:20:49 +02:00
RavingManiac 145b627464 Storage system altered to be storage space based 2015-07-12 22:25:43 +08:00
Zuhayr 4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
Yoshax aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00