* add inheritance to lathe recipes and make result an override
* add GetResult method to lathe system
* make other parts of the code use GetResult
* clean up the stock parts yml
* remove unused apu boards from dynamic recipes
* make inverse dictionary public so test doesnt have to copy paste
* revert result override stuff
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 3bdd2e3a872834b48595d33629046f4866016e31)
* tea plant, blumpkin
* fix linter
* fix tests pls
* bloompkin
* forgor rsi
* work please
* WORK PLEASE
* migration of the blumpkins
* it is now glumpkin
* lowercase
* uppercase
* adjust values and fix blorbo
wtf when did blumpkin donut turn into blorbo donut what
* fix test
* update
* fix stupid mistake
* Update meta.json
* totally not a webedit
* not a webedit 2
* nitpicks
(cherry picked from commit 19526182035345c5cf8c675691666ee2c7ffa5ec)
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit 659010993fef23b707a646008495cf17f32af700)
* Mannequin
* rsi license fix
* damage container fix
* container fix
hope this works
* layers fix + appearance comp (mb it help?)
* maybe fixed?
* one day it will work...
* can't even understand why test failing... (maybe fix?)
* last try?
(cherry picked from commit 81e41f8e8d000f6d420ce67134dc7eb49b0034ca)
* remove cloaks and mantles from dresser
* remove mantles from lathe
* add role timer loadout thing
* add back cloak dresser
* fix test fail
* potentially fix test fail (?)
(cherry picked from commit c6209cc725f25ef9e73daa241a84c3e0ea1b822d)
# Description
Adds the iconic Garand Ping to the Mark 1 Rifles
Changes it so Mark 1 Rifles are now Rifle Parent instead of Sniper
Changed it so it uses a en-block magazine (nightmare coding) which you
can print from sec, ammo and emagged autolathe.
Thanks to @ItsDzordz for making sure it didn't explode and testing.
# Changelog
🆑
- add: PING
---------
Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au>
(cherry picked from commit 3240d26f8d04276fc1a9dcba447dd26f7b13e536)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
These three items are built off of shitcode, and they like throwing
errors / causing problems, so until someone takes the time to fix them,
I'm going to be disabling them.
For safety (just incase they were mapped for some reason) Theyve also
been migrated to null
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- remove: Disabled grappling guns, tether guns, and force guns
---------
Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 81b32f1bf47cad2c1ee2c24c121dd2caa96ffdfa)
# Description
A bunch of changes to security loadouts. Making it slightly less
cluttered and adding a couple new items.
Main changes are:
Weapons are split in to their own tab to remove make main gear tab less
cluttered.
Some of the fancy uniforms from standard security are made senior
officer exclusives.
Senior officer now gets some additional exclusive gear like filled judo
belt, disabler smg and previously unused mk 32 pistol.
mk 32 "Universal" is now fully integrated in to research and security
techfab, including all the special types of mags locked behind the
appropriate research.
Head of Security gets their own version of judo belt, it's the same stat
wise but has a recolored sprite to fit with the rest of HoS' gear.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑 Kirisune
- add: mk 32 "Universal" non-lethal and security versions together with
special incendiary, uranium and shrapnel mags.
- add: mk 32 "Universal" integrated in to research and unlocking at
"Advanced Weapons" at tier 2 armory. Special mags are locked behind
relevant ammo researches.
- add: mk 32 "Universal" integrated in to security techfab. The pistol
and its mags cost slightly more to make then N1984. Standard empty,
lethal and non-lethal mags can be made round start.
- add: mk 32 "Universal" as a loadout option for senior officer costing
<s>5</s> 6 points to pick, mags costing 4 points each.
- add: Filled corporate judo belt as a loadout option for senior officer
costing 2 points. Belt is filled with standard security belt items
excluding stun baton.
- add: Disabler SMG as a loadout option for senior officer costing 2
points.
- add: Filled corporate judo belt as a loadout option for Head of
Security with a unique sprite and costing 2 points.
- tweak: Disabler SMG stamina damage increase from 15 to <s>25</s> 20.
Still lower then a standard disabler but now its more reasonable to
carry it as a duty weapon despite how bulky it is compared to other
options.
- tweak: Security formal suit, senior trooper uniform and senior trooper
hat are now senior officers exclusives.
- tweak: mk 32 "Universal" added missing accuracy components making it
not be laser accurate.
- tweak; mk 32 "Universal" decreased fire rate
(cherry picked from commit 871ff83252c28169451530e3e45cd983ad7bf179)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Smol PR that replaces the medipen box in CMO's (filled) webbing with the
medipen case. (Same thing but now uses the syringe case as the parent
entity, and has a new name n description)
Also reverts the bruizine recipe back to the old one because it's
supposed to be harder to make :godo:
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- tweak: Changed the medipen box used in the CMO's filled webbing into
the medipen case.
- tweak: Reverted bruizine recipe back to the old one.
(cherry picked from commit dbc23a263aad98d11323bd6f857e4106b139c920)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Adds Ousiana dust, allowing one to regenerate their psionic Reroll
without having to wait for Noosphere zap events, at the cost of a bowl,
1 bluespace crystal and 1 normalcy crystal, and fair amount of health.
This allowes for Psions to reliably grow their power throughout a round
so long as Epistemics does their job well and co-ordinates with other
departments for ectoplasm (via either glimmer mobs or Botany) and
offerings to the Oracle.
Note : Only way to get reagent is via crafting.
---
# TODO
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [x] Make component for returning a psion's Reroll
- [x] Add Ousiana dust reagent
- [x] Add Ousiana dust bowl
- [x] Actually add functional crafting recipe for crafting Ousiana dust
bowl
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- add: Ousiana Dust, Allows one to gain benefit from mind opening drugs
like a Noosphere Zap, crafted with 1 bluespace crystal and 1 normalcy
crystal crushed into a bowl. Probably has no long term psychological
side effects.
---------
Signed-off-by: RocketBoss360 <rocketboss360@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
(cherry picked from commit 33d79f590eab79420bca0529e624bf581f6418e6)
Because I hate tiders
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# The great nuke cleanade.
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Works way better than a cleanade, the recipe being 100 bleach, one soap,
and one cleanade into the microwave for 10 seconds.
---
# TODO
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [x] Completed Task
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑 Diggy
- add: Cleanadenuke grenade has been added, made with 100 units of
bleach, one soap and a cleanade, put it in the microwave for 10 seconds
and there you have it, enjoy flooding a room with space cleaner foam.
---------
Signed-off-by: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
Co-authored-by: Timfa <timfalken@hotmail.com>
(cherry picked from commit d5dcfc89621c5cb0f8dbe9380632d3cf939bbb2f)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Removes the epi magboots, which were functionally a reskin, and applies
that sprite to the normal magboots. The old yellow magboots sprite has
been turned into a new item called engineering magboots, which has less
of a speed reduction. New magboots have been added called combat
magboots, which provide the benefits of combat boots and some
resistances, but also are slower than normal magboots.
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- add: Adds Combat Magboots, offering all the benefits of combat boots
and magboots at the cost of a speed penalty
- add: Added engineering magboots, which are magboots with decreased
speed penalties
- tweak: Epi magboots have been merged with normal magboots
---------
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit 29ef89c5f5436d3ea26f04fd6be51addd5dafac8)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Large buff to plasma windows so that epi doesn't instantly cease to
exist the moment an artifact blows up.
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- tweak: Plasma windows now take 50% less explosion damage
- tweak: Reinforced plasma windows now take 80% less explosion damage
---------
Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit 898ae13dfe3686892205671196919ae63f4cdae5)
# Description
Brings a number of improvements to the surgical experience. Adds
morphine, a new narcotic which prevents screaming (and mood penalties)
from surgery without putting the patient to sleep. This allows for
lengthier operations without either knocking the player out or having
them scream a lot. Also adds analgesic medipens which contain 15u of
morphine (enough for 75 seconds of operation) and 5u of epinephrine.
These are included in the combat medkit, field surgery kit, and filled
CMO webbing. Additionally adds emergency nitrous oxide tanks which spawn
in paramedic lockers to potentially allow for field surgery. Also adds a
proper syringe case, craftable in the medfab, for those who want to
organise their supplies without using cigarette boxes. Finally, this
(re?)enables mood penalties for surgery without morphine/NO2 to
hopefully incentivise medics to interface with the system.
---
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
🆑
- add: Added morphine
- add: Added syringe case
- add: Added analgesic medipen
- add: Added emergency nitrous oxide tank
- tweak: Added pain pens to advanced medipen kits
- tweak: (Re?)enabled surgery pain moodlet
---------
Signed-off-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>
(cherry picked from commit 6573a2b4c7df20ac3a38d552a10748b90b7ce517)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
adds new Lumenblast shells! Lumenblast shells are a direct upgrade to
beanbags that cause 40 stamina damage and cause a flash on impact. These
will be extremely useful for riots and nonlethal takedowns, as they do
next to no actual damage.
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- add: Lumenblast shells, more powerful beanbag rounds with a flash
effect on impact
- add: Security can now take a sawn off shotgun as a duty weapon; it
comes with 4 lumenblast shells, two already loaded
- tweak: Flares can be loaded into the flare gun
---------
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit e99beddb715c6cd9fa88f1ad23390457b74e35bb)
