Commit Graph

162 Commits

Author SHA1 Message Date
SkyratBot
18f7ed58eb [MIRROR] Removes older ID consoles from the code, and circuitboards (#3284)
* Removes older ID consoles from the code, and circuitboards

* Merge branch 'master' into upstream-merge-56792

* a

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-16 12:44:12 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
c0e36814ca [MIRROR] Add missing newline in circuit board definitions (#3207)
* Add missing newline in circuit board definitions (#56745)

Two of the type definitions did not have a newline separating them.

* Add missing newline in circuit board definitions

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:47:46 +00:00
SkyratBot
3c37bdc8e5 [MIRROR] disables godmode for some vendors and adds missing refills (#3103)
* disables godmode for some vendors and adds missing refills (#56570)

* disables godmode for some vendors and adds missing refills

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-05 21:24:37 +00:00
Gandalf
db677186eb Lopland Security and Armadyne Weaponry rework [Security Medic and Sergeant] [RFT] (#2860)
* REMOVE BATONG

* Stage 2 emitters

* aaa

* aaaa

* Climb up and start the rotors

* the DOORS MASON

* Stage 3 emitters

* a

* a

* Update belt.dm

* aaaa

* more clothes

* update, wintercoat!

* Update wardrobes.dm

* Update wardrobes.dm

* test

* Better

* STAGE-4 BOIS

* No wait, it's stage 5

* aaa

* gunsets and tokens!

* hot backend stuff

* Fixes

* aaa

* QUICKDRAW!

* The smartgun

* a

* a

* a

* Map changes

* a

* Merge branch 'master' into thesecining

* Merge branch 'master' into thesecining

* PHASE 6 LADS, IT'S DONE!

* Merge branch 'master' into thesecining

* smartgun delay

* New HUD and ID cards + EMP protection system

* Create readme.md

* flashlight

* clof

* Update master.dm

* 6.5

* armadyne

* SECURITY SERGEANT AND MANY TWEAKS

* Update security.dm

* a

* Update jobs.txt

* Update security_sergeant.dm

* Report to!

* Update guns.dm

* Merge branch 'master' into thesecining

* redesign

* Update MetaStation_skyrat.dmm

* Update KiloStation_skyrat.dmm

* Update decals.dm

* It's nearly done lads.

* corpo

* a

* Update ammo.dm

* a

* Update bullets.dm

* fuxes

* Update shields.dm

* a

* Update guns.dm

* Bullet drive + fixes

* Update gunsets.dm

* Update bulletdrive.dmi

* Update hud.dmi

* fix

* fs

* a

* .

* Update bullets.dm

* aaa

* Update bullets.dm

* Update tgstation.dme

* bulletbot

* Update bulletbot.dm

* a

* oops

* fixes

* aaaa

* Update vending.dmi

* a

* seclock

* aaa

* a

* a

* a

* Update ammoboxes.dmi

* fixesa

* a

* Update guns.dm

* a

* Update guns.dm

* Peacekeeper hardsuit

* a

* a

* aaa

* Update peacekeeper_clothing.dm

* couple fixes

* Merge branch 'master' into thesecining

* hitscan laser gun

* a

* Merge branch 'master' into thesecining

* a

* a
2021-02-04 16:38:48 +00:00
SkyratBot
0362e03c1b [MIRROR] Thrown vending machines crush mobs + move circuitboard define (#2339)
* Thrown vending machines crush mobs + move circuitboard define (#55723)

* Thrown vending machines crush you

Also moves circuitboard define

* Remove extra empty line

* Move code to fitting place

* Thrown vending machines crush mobs + move circuitboard define

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
2020-12-27 06:05:50 +01:00
SkyratBot
01c508c810 [MIRROR] orange's chemical romance Pt. 1: Base construction console refactor (#2278)
* Base construction console refactor (#55451)

Refactors base construction consoles to be generic instead of only being meant for building the aux shuttle. The current aux base construction console behaves the exact same.

This PR is A step towards minichem, as I'll be using base construction code in it pretty heavily. More information about the whole minichem thing in this design doc

In terms of player-facing changes, this PR has made possible a neat admin-only base construction console that can be used to construct things anywhere on the z level.
Why It's Good For The Game

The current base construction console code was snowflakey and didn't follow particularly great coding practices. This fixes that and provides a solid foundation for future work.

* orange's chemical romance Pt. 1: Base construction console refactor

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
2020-12-23 06:13:58 +01:00
SkyratBot
ed2487f201 [MIRROR] [READY] Kitchen Rework part 1: I just want to griddle! (#2173)
* [READY] Kitchen Rework part 1: I just want to griddle! (#55319)

This PR essentialy moves away from the extremely microwave dependent cooking we have for meat right now, and making it a bit more sensical by making you use a grill to grill meat. The grill takes a different time (with variation) for different grilled things. Once finished it will turn that food into something else.

Yes, this does mean creating burgers takes longer, but in return you can make more patties at once, and you are not required to stay at the grill while its going. This lets you cook as much as you want at once, just make sure your meat doesn't burn!

In the future, I hope to move more things like this to machines similar to this (Pasta boiling, putting eggs on the griddle, soup making, etcetera) to create for a more interesting cooking experience.

* [READY] Kitchen Rework part 1: I just want to griddle!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-12-14 02:01:55 +01:00
SkyratBot
548ed09ed1 [MIRROR] Temperature control unit (#2154)
* Temperature control unit

* Update tgui.bundle.js

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2020-12-13 13:54:41 +00:00
SkyratBot
38c778c9bf [MIRROR] Cargo can now order empty supplypods through the express console (#2052)
* Cargo can now order empty supplypods through the express console (#54215)

* Cargo can now order empty supplypods through the express console

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
2020-12-06 04:12:06 +01:00
SkyratBot
6457491756 [MIRROR] Fixes detdrobe construction bug (#2005)
* Fixes detdrobe construction bug (#55264)

Lets detectives disassemble their vendor to restock it I guess.
They could rebuild it if someone else broke in and took it apart too?

* Fixes detdrobe construction bug

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2020-12-02 07:51:14 +00:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
993d3c945a [MIRROR] More HFR fixes (#1961)
* More HFR fixes (#55203)

- Refractor HFR core from binary device to unary device to fix issue with cooling not properly connecting, that was deleting gases when tryed to use (only one port cooling now similar to a Thermomachine)
- Small fix of GUI data where two vars were inverted

* More HFR fixes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2020-11-30 17:27:38 +00:00
SkyratBot
742559ebde [MIRROR] Properly differentiates the nanodrug and nanomed vending machines. (#1776)
* Properly differentiates the nanodrug and nanomed vending machines. (#55069)

This repaths the nanodrug and nanomed vending machines, as well as visually tweaks the nanodrug vending machine from the nanomed vending machine, in order to
A) Fix the correct vending refills working on the correct vending machines.
B) Not make 2 different vending machines with different contents sell look identical.

Allows for visual clarity between 2 distinct, different vending machines. I got lazy and didn't do it the first time, and now they've been confusing players, apparently.
Additionally, makes them actually deconstruct able and constructible as a result of the fix to the circuit board.

* Properly differentiates the nanodrug and nanomed vending machines.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-22 22:36:11 +00:00
SkyratBot
6ee9837409 [MIRROR] [WIP] Remove fusion from reactions, add hypertorus fusion machinery (#1719)
* [WIP] Remove fusion from reactions, add hypertorus fusion machinery

* a

* Merge branch 'master' into upstream-merge-54379

* Update tgui.bundle.js

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-11-19 07:27:51 +01:00
SkyratBot
9e88359f04 [MIRROR] Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#1686)
* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)

* The Re-pricening

* Rewritten and adjusted for paycheck defines.

* I made the map changes finally.

* And the refills too.

* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"

* And the premium ones too.

* Accidently spoiled a future pr due to dme bleedover

* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-14 21:49:11 +01:00
SkyratBot
6937b72f39 [MIRROR] Removes capitalisation from stasis bed name (#1528)
* Removes capitalisation from stasis bed name (#54680)

About The Pull Request

Makes the name of the lifeform stasis unit lowercase like all other improper nouns.
Why It's Good For The Game

Consistency, I guess

* Removes capitalisation from stasis bed name

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2020-11-01 11:26:59 +01:00
SkyratBot
1536a524d4 [MIRROR] Arconomy: Civilian Bounty Redux and full replacement of cargo bounties. (#1429)
* Arconomy: Civilian Bounty Redux and full replacement of cargo bounties.

* a

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-23 12:49:18 +02:00
SkyratBot
d13a1a36ac [MIRROR] removes hexane (#1382)
* removes hexane (#54437)

removes hexane gas from video game

(the ability to hear dchat got removed like half a day ago) (Lemons note, it's been more then half a day)

it will speed up atmos a bit with less reactions, the reagent from the gas does the same things as halon + bz and the reaction from it is pretty similar to halon, they are both gases that exist to stop fires, i dont think we need both

* removes hexane

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-10-19 21:12:45 +01:00
SkyratBot
bcb5fbc83c [MIRROR] TGUI Communications console (#1286)
* TGUI Communications console

* fix

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-10-14 17:45:53 +01:00
SkyratBot
65a2223ddf [MIRROR] Fixes the supply console not inheriting contraband and emag status from its circuit (#1197)
* Fixes the supply console not inheriting contraband and emag status from its circuit (#54177)

Added an abstract proc for circuits intended to be used to allow a circuit to configure a machine.

Overrode this proc for supply console boards (behaviour inherited by express boards)

Call this proc in supply console on_construction (behaviour inherited by express supply consoles)

Allows all supply consoles to inherit their circuit's emag and contraband status.

Doesn't look like any other circuits use this sort of functionality, but if they do I'll fix 'em up too.

* Fixes the supply console not inheriting contraband and emag status from its circuit

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-10-07 23:26:39 +02:00
SkyratBot
0c1833ff9a [MIRROR] Atmos Machinery Variants (#1038)
* Atmos Machinery Variants  (#54015)

Adds variants for a bunch of atmos machinery that were missing them:

    unary tanks
    atmos filters
    atmos control computers (and circuit boards)
    atmos tank turfs
    atmos tank outlet injectors
    atmos tank siphon vents
    gas miners

* Atmos Machinery Variants

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-09-29 12:25:50 +02:00
SkyratBot
8378eb482a [MIRROR] Fixes whiteship console losing GPS signal (#1031)
* Fixes whiteship console losing GPS signal (#53998)

Deconstructing and rebuilding the whiteship console will switch it back to the GPS-less subtype. Added a new board and assigned it to the whiteship bridge console to remedy this.

* Fixes whiteship console losing GPS signal

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-29 00:31:59 +02:00
SkyratBot
443dcf512f [MIRROR] Fixes various issues related to machine component contents. (#991)
* Fixes various issues related to machine component contents. (#53943)

Fixes machines not referencing their circuits in their component parts when built manually, causing them to vomit out their circuit board when opened. This also fixes Runtime in _machinery.dm, line 607: Cannot read null.req_components from using the B/RPEDs.
Fixes computers not storing circuits in the contents.
Fixes smartfridges vending their components.

* Fixes various issues related to machine component contents.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-26 10:42:52 +02:00
SkyratBot
ef28f115cc [MIRROR] Machines now store their components in their contents. (#966)
* Machines now store their components in their contents. (#52970)

Machine parts are now located in the machine instead of nullspace.

* Machines now store their components in their contents.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-24 20:33:40 +02:00
SkyratBot
f93ca59e1d [MIRROR] [R&D Machine Overhaul, Part 1] - Various machines no longer require R&D machines to function. (#618)
* [R&D Machine Overhaul, Part 1] - Various machines no longer require R&D machines to function. (#53339)

Removes various R&D machine requirements including circuit imprinters, protolathes, destructive analyzer and the mechfabs. All machines that previously required an R&D console to function are standalone, including omni protolathes and omni imprinters.

Replaces "production"-class R&D consoles with civilian modular computers on all maps. There are no longer "production"-class consoles.

Removes the concept of "core" R&D consoles. R&D consoles only research and handle tech disks and stuff. All existing core consoles have been switched to their basic archetype.

Because it's a pain in the ass to manage, material reclaimation has been removed from the destructive analyzer. The destructive analyzer is now ONLY for destroying items and unlocking research nodes such as illegal and alien tech.

* [R&D Machine Overhaul, Part 1] - Various machines no longer require R&D machines to function.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-02 03:36:16 +02:00
SkyratBot
4a8bf70af3 [MIRROR] Removes singularity, tesla, TEG and Mrs. Pacman. Changes supermatter overcharge delam. (#345)
* Removes singularity, tesla, TEG and Mrs. Pacman. Changes supermatter overcharge delam. (#52873)


About The Pull Request

This PR removes the tesla and Mrs. Pacman from the game. The title is actually misleading, the TEG and singularity are still in the game but inaccessible and the singularity no longer has its generator.

Field generators and tesla coils have been kept because shocking your fellow man is the greatest sensation of power in the world.

The overcharging delamination for the supermatter has been replaced by the release of 2500 mols of tritium at 500,000 kelvin. An engineer who's really hateful of the station can use this for fusion, if they desire. Otherwise, its a tritium fire in engineering alongside the explosion. This will probably be changed in the future to be more potent since the explosion will pretty much just space all the tritium away.

Singularities no longer produce radiation. Now, keeping one is less about making power and more about making a statement, especially since you need to delaminate an SM shard for it.
Why It's Good For The Game

Having power optimized for one generator (SM+Turbine) will allow balancing to be feasible, also oranges wanted this. The other generators may later return but with tweaked values and different roles.
Changelog

🆑
del: Nanotrasen has removed their outdated teslas, singularities, TEGs and Mrs. Pacman generators from their servers and warehouse.
/🆑

* Removes singularity, tesla, TEG and Mrs. Pacman. Changes supermatter overcharge delam.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2020-08-15 00:53:05 +02:00
SkyratBot
ade641b896 Adds the Account Registration Machine. (#52745) (#326)
This adds the Account Registration Machine to the game, it's obtained at the computerized recordkeeping tech (Rather far in to the tech tree) and only obtained from the security lathe to prevent access from being too widespread, because I don't trust players have access to this until at LEAST half the shift has gone by. What this enables you to do is to create new accounts for blank IDs. The accounts won't have a parent payment account until actually assigned a job by a card console, but for all intents and purposes they'll act and interact like a standard, station bank account.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-13 05:23:33 +02:00
SkyratBot
56f65770e2 [MIRROR] Plumbing teleporters (#321)
* Plumbing teleporters (#51881)

* Makes the plumbing RCD accept every object

* Adds simple plumbing teleporter

* Polishes plumbing teleporters

* Fixes runtime

* this to src

* circuitboard doesnt need anchoring

* Fixes overlay flickering being weird

* Makes the Chemical Recipient's positioning less awkward

* Comments and documentation

* uh

* Fixes dme

* Revert "uh"

This reverts commit af6f30089f9f31d527f6ab3e2b1c72cf6ab6d60d.

* Update code/_globalvars/lists/construction.dm

Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

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

Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/plumbing/plumbers/_plumb_machinery.dm

Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* uncasts loop

* update icons

Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Plumbing teleporters

Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-08-13 00:20:00 +02:00
SkyratBot
b104cdf3ed [MIRROR] [READY]Dropping Now, Stand By For Titanfall: Mecha Orbital Pad (#245)
* Dropping Now, Stand By For Titanfall: Mecha Orbital Pad (#52224)

* mecha orbital pad

* mecha orbital pad 2

* mecha orbital pad 3

* mecha orbital pad 4

* mecha orbital pad 5

* mecha orbital pad 6

* mecha orbital pad 7

* fixing conflicts

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* conflicts and map and tgui and icons bro

* fix

* wa

Co-authored-by: Rohesie <rohesie@gmail.com>

* tguy

* Removed eslint ignore

Shouldn't be impacting the build.

* Update code/game/machinery/computer/mechlaunchpad.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* some fun stuff

* cool desc

* final changes hopefully

* late initalizing

* bitflags

* one last thing

* rohesie stuff

* Update tgui.bundle.js

* mm

* Update tgui.bundle.js

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>

* [READY]Dropping Now, Stand By For Titanfall: Mecha Orbital Pad

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-08-09 09:57:35 +01:00
ShizCalev
e07dce2f3d Fixes invisible bepis boards (#52605) 2020-08-01 06:40:46 -04:00
AnturK
1f5e905c0d Simple skill/skillchip framework (#52314)
* Simple skills framework.

* Map changes.

* Adds skillchips to vendor

* Adds skill stations to the map.

* Circuitboards

* Fix typo

* Some minimal instability

* Fixes,tweaks etc

* Suggest better names or we'll end up with these.

* sharpness thing

* tgui build

* Makes wine from booze synthetizer show to wine tasters.

* Makes wine from dispenser have taste for wine tasters.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Swaps to carbon var.

* wordy helper proc

* While i'm at it, other relaymoves

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 04:14:10 -04:00
ShizCalev
f475d7030e Smartfridges will now drop boards set to the type of fridge they were when deconstructed (#52497) 2020-07-26 13:42:54 -04:00
skoglol
cdd1dfa09b Merge pull request #52274 from ArcaneMusic/bepisv3
B.E.P.I.S. Version 2.0: Cargo Trimming
2020-07-23 12:00:25 -04:00
ArcaneMusic
72b7c738af Arconomy 1.0: Final Stage Capitalism (#52007)
* Part 1: Arcane is challeneged to rewrite all of economy at 4am on a wednesday, accepts

* Miasma? DUNKED
Bounties? CHUNKED
Hotel? TRIVAGO

* End of day... 2? 3? lockdown has ruined me

* Day 3. I cannot unto bogdanoff. Send help.

* So far so good.

* Day 4, in the ghost house. I've resprited a beloved machine with soul in it. There is a chance, I am losing my mind. Sometimes I hear the words, "When is economy done, arcane", and I look over my shoulder, and oranges isn't there, because he lives in New Zeland. Probably.

* We'll throw the technodes and mapchanges in too.

* Okay lets keep this a friendly debug item then

* yeah on second thought lets not make a precision testing instrument on a 50% success ratio.

* Newscaster updates.

* TGUI Rebuild 1 start counting fokes

* Runtime BEGONE FROM ME, fckn typepaths

* Cleans up autodocs, and other areas

* Updates tgui because I feel nothing anymore

* Recompiling tgui for that green check

* dunks the whole mint out of the code, get that hothead outta here.

* Green checkmark daily update.

* Should be decent from here.

* Resolves machine_design conflict

* Rebuilds TGUI again for the epic pogs

* Sweeping changes 2: See additional changelog

* Haunting insurance plus changes the define comment.

* Rounded vending prices, made bounties appear on examine, polish

* Atmos tanks now specify their mole requirements.

* TGUI 4.0 Updated.

* ACTUALLY updates to TGUI 4.0 standards.

* ThE bUiLd DiFfErS fRoM oUrS

* Ah, I didn't see the testmerge get re-upped.

* TGUI Rebuild.

* Shuffles some security-assistant bounties around
2020-07-19 13:44:25 +02:00
LemonInTheDark
92209dd23a Sweeps up some rarely used and unbalanced sources of research points (#52012)
About The Pull Request

Removes the research point gen modes from tesla coils and rad collectors.
Someone is gonna take some flak for removing these at some point, may as well be me.
Why It's Good For The Game

THE DESIGN DOC DICTACT-

Nah powergen should be valid on it's own, it shouldn't need to rely on other econs to make it worth the work. We can try that later, but not now.
Changelog

cl
del: Removed the research modes from tesla coils and radiation collectors.
/cl
2020-07-07 11:02:33 +12:00
ArcaneMusic
eee922ee7f Updates vend-a-trays to have a unique UI, improves accessibility. (#51931)
* Initial commit, updates trays into 2020

* Adds vend-a-trays as a service machine, without it being a machine.

* Replaced the mapped vend-a-trays with service unique versions.

* "YoUr BuIlD DiFfErS fRoM mAsTeR"

* Removes {}s from img, workin on the other part

* All my homies recompile on merge conflict

* Fixes end of line because honestly there must be no god on this green earth

* hopefully this isn't too excessive.

* How's this?

* Applies Anturk's Confirm suggestion.

* Shipped, workshopped with style a bit

* Alright that's probably enough fiddling for now

* Rebuilds.
2020-07-06 11:37:06 +03:00
Timberpoes
4d7f5863f9 Change genetics machine department flags, fix inconsistency (#51670) 2020-06-22 15:48:19 +02:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
spessman-007
ab84042f94 [READY] Improve spelling (#51134)
* Improve spelling

* Spell isn't, ain't, shouldn't, hasn't, wasn't correctly

Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 02:13:37 +08:00
Ghilker
838b2b2ba7 Make the electrolyzer not a wait game (#50598)
* Electrolyzer balances

* better sprites(thanks trollbreeder!)

* reduce h2 export cost a bit

* h2 canister sprite change
2020-04-26 00:06:37 -03:00
Ghilker
9532dbd2a8 Hydrogen Gas (#50510)
* new PR no tgui bundle build yet

* tgui bundle built

* atmos.dmi conflict fix 2

* balancing

* tgui bundle fix
2020-04-20 14:47:22 -03:00
Jordan Brown
833446fd1f Merge pull request #50420 from ArcaneMusic/slowerprocessing
Properly removes the leftovers of the gene modifier from the techtree.
2020-04-06 19:33:35 -04:00
TiviPlus
b6711991f7 I fix a thing noone wants fixed but the orang man (#50384) 2020-04-05 19:13:46 -04:00
ArcaneMusic
624e5ed1c8 Whoops. 2020-04-05 19:07:14 -04:00
ArcaneMusic
14b7e63415 A bold new era of hydroponics (Large department rework/update) (#50001)
Shoutout to skog for helping me fine tune a lot of the ideas for this as well as convincing me to do it anyway. Feel free to send me your adoration and glory (once this is actually balanced and tested out so I can work out the like 1000 little runtimes and bugs this will surely have.)
About The Pull Request

Lets Start with everything that DIDN'T change.
Plants still have all their unique qualities. That includes chems, traits, all that good stuff.
Plant stats have been unchanged, with an exception I'll bring up later.

Cool. Onto everything else.
Changes to hydroponics trays.

Trays now have a new feature that visually you may be very familiar with. By Ctrl Clicking a tray, it activates Autogrow. Autogrow uses a HEAVY amount of power per tray, but in return it automatically maintains the plant contained within, limited nutrient loss, adding a gradual amount of water per process, and keeps pests and weeds at bay. Ideally you would only be using this on high maintenance plants, or if you need to leave your department for a few minutes. Having all your trays on Autogrow is an excellent way to kill your APC cell in a matter of seconds, even on a robust power setup.

Trays no longer use **Nutrient Points.** Instead, each tray has an internal reagent holder that basically holds a beaker for your plant's nutrients. In exchange, the tray now determines the gradual stat changes of plants based on nutrients within that nutrient tank. That's right, no more dumping chemicals into the tray to reach 100 potency in a matter of minutes. You can, however, use reagent mixes in order to improve plant stats in a satisfying way. Still, with each tray having a default of 10 reagents maximum in the tank, it places a greater impetus on upgrading trays if want to really get the most of a specific chemical composition.

If you realize you need to change the nutrients in the tank, you can Alt Click to empty the whole tank at once.
Seed Changes

All plants now have a new stat, Instability. (It was originally titled stability so I'm changing it here but yes it is now called instability) Contrary to the name, the higher the stability of the plant, the more likely that your plant will see radical changes. Plants with a low stability will not see much difference, but as you go higher and higher you will start seeing the plant automatically mutate with harsher ramifications. At 60 Stability, the plant has a chance to automatically mutate it's species. At 80 Stability, assuming you can prevent the plant from mutating beforehand, the plant has a chance to receive random plant traits similar to strange seeds. That's right! You can now be free from the tyranny of the strange seed market!

Plants are now affected differently by pests and weeds. Instead of outright killing plants, they will instead heavily lower a plant's yield and potency instead. This also allows for plants that have been left for a few minutes to outright die far less than they were before, but at the same time encourage using autogrow when AFK within the department.

When growing a plant however, you have something new to consider. Plants will now pollinate adjacent seeds in trays, which will bleed off adjacent stats to other plants. Primarily, this affects your core stats. like potency, yield, also stability. If you have 2 plant with high and low potency, they'll bleed their stats off into each other as they grow. This allows for interesting mechanical gameplay between nutrient choices, stability, and adjacency. Some plants have naturally high stability that can bleed off of other plants (Corn, Wheat, and Weeds), while others have naturally low stability and can help bring plants back into a maintainable stability threshold if you just want to harvest the plant itself.

Pollination at high levels of stability can also cause the adjacent plants to receive chemical traits from each other. This allows for plants to share chemical traits without having an insane level of control afforded by the DNA manipulator. However, careful manipulation of plant reagents is difficult to do perfectly, and should be done carefully, as well as experimentally.

For a more controlled trait experience however, we have Plant Grafts. Plant grafts are obtained by using the new secateurs, or sheers, that comes with the botanist's default kit. When a plant is ready to harvest, you can cut off a plant graft, which carries several of the plant's stats and qualities with it. When transplanted, you can share the unique traits of several plants into a new host. These traits are mostly the physical traits you're most likely familiar with, like bio-luminescence, slippery skin, liquid contents, the works. You can also store plant grafts if there's a specific trait build you'd like to eventually get to. Since you need to fully grow a plant to graft it, the process of obtaining several unique traits for a plant will result in more types of plants needing to be grown as a result.

Alright, this leads up to what you're probably guessing. DNA manipulator for plants is dead. Even if it's really good, being able to Frankenstein a dozen different plants together without even growing half of them is kinda lame, you have to admit. The new trait and chemical controls are a bit more robust overall to compensate for this.

image
Why It's Good For The Game

Chemical dependence hydroponics is dead.
Genefreak maxed out stats plants are dead.
The Tyranny of Pests and Weeds killing plants for cooperating with the station is dead.
Ambrosia Gaia is now no longer the staple plant of hydroponics, as earthblood trays are dead.
Plant mutations are now easier to come by, and can be achieved within 2 plant generations assuming you're not crossbreeding and using readily available chems.
Chefs, and by extension bartenders, get a wider array of plant's each to work with.
Botanists are no longer required to acquire a chem dispenser at shift-start to acquire mutated plants.
Crosspollination, mutation, and grafting allows for a more interesting dynamic in improving plant stats, as opposed to just clicking buttons. It also rewards planning and developing system for growing plants.
Changelog

🆑
add: Plants can now Cross-Pollinate, via adjacency. This causes plant stats of average into each-other.
add: Plants now have a new stat, Instability. Instability allows for gradual mutations to a plant's stats at certain thresholds, and a chance of mutation, or gaining new random traits at even higher thresholds.
add: Plants can be grafted when ready to harvest, and grafts can be applied to plants in order to share unique traits, or share stat changes.
del: The Plant DNA Manipulator is dead. Long Live the DNA manipulator.
tweak: Hydroponics trays now have their own internal beaker for holding chemical reagents. As such, chemical affects on plants are gradual, and slowly alter seed stats over generations.
balance: Several chemicals are adjusted to match the new system. Experiment!
/🆑
2020-04-03 16:56:25 +13:00
Capsandi
c04affe83c Adds deconstruction and unanchoring to sheetifier (#50014)
* notsosheetynowareya

* notsorequiringanchorageonbeingbuiltnowareya

* howdidiforgetthat

* Update code/game/machinery/sheetifier.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 09:07:49 -03:00
spookydonut
106b4ba672 book console fix (#49696)
* book console fix

* proper console for randomruins
2020-03-05 21:38:40 +08:00
Qustinnus
4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00