Commit Graph

51 Commits

Author SHA1 Message Date
SkyratBot
031e483e4d [MIRROR] New station trait job: Human AI (#26823)
* New station trait job: Human AI (#81681)

This PR does many things, I'll try to explain the basic/background stuff
to the main thing first:

1. Adds a new remote that allows a human to function like an AI. It
controls a fly that will fly around the station slowly, and when it
reaches a machine then the person can interact with it as if they were
an AI. This required changing a lot of silicon/AI checks with one that
also checks for this remote, and some messing with shared ui state.
2. Moves req_access from the obj and bot to ``/atom/movable`` which lets
it be shared between the two, no more copy-paste and one side lacking
features/checks/signals the other has.
3. Adds a check for AI config for AI-related station traits, which was
lacking prior

Now for the good part...
Adds a new station trait that replaces the AI with a Human.
This person is equipped with an AI headset (including Binary), an
advanced camera console, an omni door wand, the machine controller, and
their laws.
They are immune to the SAT's turrets (even if set to target borgs) and
are slow outside of the SAT, mimicing the actions of the AI.

They interact with the world through their advanced camera console,
which allows them to do most AI stuff needed, and the holopad they can
connect to without having to ring first (like Command can).

They are given a paper with the laws they must follow, but since they
are human they are able to bend it. Cyborgs that run the default lawset
are "slaved" to them via an unremovable law 0, so the Human AI can bend
the laws if they really need to (for their own survival n such), and
make the cyborgs obey their commands above laws, but in general this
shouldn't be a frequent occurrence. This does take into account the
unique AI trait, so it's not guaranteed Asimov.

When this station trait rolls, all Intellicards, AI uploads, and AI core
boards are destroyed and are unresearchable. They can be spawned by
admins in-game if necessary. Maybe in the future we can also exclude
Oldstation from this but I haven't really decided.

Extra perks:

Human AI spawns with a Robotic voicebox (unless they are a body purist)
and teleport blocking implant, so they can't use teleporters to bypass
their on-station slowdown.
They also have an infinite laser pointer that can be used to blind
through their camera console. This is unfortunately nerfed from the
recent borg balance PR that removed its stun. This was meant to be the
alternative to no longer being able to permanently lock borgs down like
AIs can (or more than one, for that matter).
They aren't affected by Roburgers, Acid, and Fuel's toxicity.
Bots salute them like they do Beepsky (which is now a trait)
They spawn with SyndEye to replace the AI's tracking ability
They do not have a bank account

The machine remote has a little fly in it that flies to the machines it
is pointed to, working as the arms and legs of the Human AI. It scans
the machine and punches in the action the AI does, and is how the AI
accesses basically anything. This fly slowly moves from one machine to
the next, and can be recalled with Alt Click.
It works on machines and bots.

https://github.com/tgstation/tgstation/assets/53777086/e16509f8-8bed-42b5-9fbf-7e37165a11e8

I've seen a funny screenshot one day of a person replacing the AI by
using a bunch of door remotes, camera console, crew monitoring console,
and a few other things. I've been thinking about that for a few years
and really wanted to make it official if not easier to make possible,
because it is an incredibly funny interaction.
This makes it a reality, and while they aren't as powerful as regular
AIs, I think it makes for better and funnier in-game moments. With the
same weight as Cargorilla (1), I hope this wouldn't be rolling too often
and ruin rounds, but instead show off the different capabilities that
Humans and AIs can do, to do the job of an AI. You win some you lose
some.

🆑 JohnFulpWillard, Tattax
add: Adds a new station trait job: The Human AI.
/🆑

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>

* Oh right

* so this works

* whoooops

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2024-03-31 22:39:22 -04:00
SkyratBot
45bb64113d [MIRROR] Adds some trailing commas to lists, fixes typo [MDB IGNORE] (#24812)
* Adds some trailing commas to lists, fixes typo

* Update orderconsole.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-11-06 06:35:10 +00:00
SkyratBot
e8afe219f5 [MIRROR] GMM UI & Cargo budget handling tweaks [MDB IGNORE] (#24672)
* GMM UI & Cargo budget handling tweaks

* Fixing diffs

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-10-31 03:01:09 -04:00
Bloop
b3b7b8f0e1 [MISSED MIRROR] Adds user feedback for going over order limits in cargo console (#76344) (#24032)
Adds user feedback for going over order limits in cargo console (#76344)

This'll prevent weird "above the max by accident" cases, and also uses
defines instead of hardcoded stuff. This code is often duped, wish we
had a better way of handling it.

Oh also removes a few safety copies before for loops that aren't
actually needed (for x in list copies the list)

Better UX, slightly saner code

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2023-09-30 22:40:21 -04:00
Paxilmaniac
1f204e806e Guncargo 2023 : I love the free market : No interest, no buying companies, no money down! : Cheaper literally everything (#23244)
* ea nasir damn you

* surely there are no consequences to any of this

* nineteen dollar pistol, just a week away

* i love buying product

* look at all these great deals!

* just a week away

* should fix windows build

* should let borgs place requests

* lets borgs use it fr

* epic logic L

* actually for real fixes silicons ordering from imports

* get real

* makes cargo ordered stuff not show up locked in a crate

* makes it impossible to get that infinite cash from small orders

* i dont think we need this anymore?

* switches up the selection a tiny bit to fit the new system

* removes a bit i commented out but didnt delete

* lets see if moving that to static data makes it still work fine

* turns out that it was not, in fact, fine

* Update modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* makes adv tools more expensive and fixes budget orders

* restricts some large weapons i forgot to

* fixes some magazine import pathing

* those dont exist anymore pal!

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-08-30 16:20:01 -04:00
larentoun
05ba93ae51 [REFACTOR] Moves some Cargo-related stuff to master_files (#22676)
* move to masterfiles

* remove dependecies

* update dme

* hidden -> special

* update readmes
2023-08-30 16:13:51 -04:00
SkyratBot
e264ee3644 [MIRROR] Adds an extra malf AI ability: Remote emagging. Also tidies up emag code and coverts a lot of things to balloon alerts [MDB IGNORE] (#22469)
* Adds an extra malf AI ability: Remote emagging. Also tidies up emag code and coverts a lot of things to balloon alerts

* Update communications.dm

* Modular override

* Some modular adjustments, removes 'emagged' vars in favor of obj_flags

* whoops, mobs don't have obj_flags.

---------

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-15 16:46:17 -04:00
SkyratBot
d8a19cf7ae [MIRROR] Makes cargo orders and req forms easier to differentiate [MDB IGNORE] (#22227)
* Makes cargo orders and req forms easier to differentiate

* Update code/modules/shuttle/supply.dm

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>

* removes one skyrat edit in favor of this

* Too much whitespace

---------

Co-authored-by: Nick <42454181+Momo8289@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2023-07-12 06:38:10 +00:00
SkyratBot
b3b772d66d [MIRROR] [s] Stop trusting user input in cargo computers [MDB IGNORE] (#22064)
* [s] Stop trusting user input in cargo computers (#76343)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Swear to fucking christ

* [s] Stop trusting user input in cargo computers

---------

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2023-06-26 16:35:36 -04:00
SkyratBot
ea7d14188f [MIRROR] Don't use usr var inside ui_act() in cargo computer [MDB IGNORE] (#22003)
* Don't use `usr` var inside `ui_act()` in cargo computer (#76007)

## About The Pull Request

As explained in
https://github.com/tgstation/tgstation/pull/74696#discussion_r1166099547

> no, bad 🗞️
> if this is in ui_act the ui datum holds a reference to the user mob,
use that. We do not guarantee that ui_act will be called off topic()
forever (it runs at the end of ticks so is possibly gonna get verb
delay'd at some point)

So yeah let's do that

## Changelog
🆑
code: makes sure cargo computer doesn't use `usr` var inside `ui_act()`
which could cause undefined behaviour
/🆑

* Don't use `usr` var inside `ui_act()` in cargo computer

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
2023-06-23 16:16:39 -07:00
SkyratBot
372fb9ab93 [MIRROR] Cannot use departmental budget cards as source of credit withdraw [MDB IGNORE] (#21915)
* Cannot use departmental budget cards as source of credit withdraw (#76113)

Currently you can put cargo's budget card into your PDA, go into NT Pay
and send over the budget to any pay token you want including yours. This
just adds a check to ensure you aren't using that kind of card as
withdrawal source.

* Cannot use departmental budget cards as source of credit withdraw

---------

Co-authored-by: Pepsilawn <reisenrui@gmail.com>
2023-06-18 13:44:19 +01:00
SkyratBot
ff6c2c3ca5 [MIRROR] PDA Fixes and Changes and Cargo Console Fix [MDB IGNORE] (#21617)
* PDA Fixes and Changes and Cargo Console Fix (#75768)

Was updating the documentation about PDAs on the wiki and saw some minor
issues, threw in the bug fix for issue
https://github.com/tgstation/tgstation/issues/75231 as well because why
not.
Also added the ability to put medipens into PDAs, they're small and
pen-like enough, right?

* PDA Fixes and Changes and Cargo Console Fix

---------

Co-authored-by: Oreo <20830349+Peliex@users.noreply.github.com>
2023-06-07 15:31:32 +02:00
SkyratBot
7ffc0e786e [MIRROR] Cargo category cleanup [MDB IGNORE] (#21119)
* Cargo category cleanup (#75374)

## About The Pull Request

I accidentally discovered that when #55504 removed cargo export
categories being a thing during export value evaluation, in two
instances, they forgot to remove passing over the now defunct export
categories, causing it to be passed in as the elasticity value, and by
sheer coincidence, this was not causing problems (due to being overriden
by a named argument in the pirates case, and cargo_exports being
evaluated as true in another).

This PR fixes the arguments, preventing possible bugs in the future.
This also removes the code that set if the cargo shuttle could sell
contraband and emagged items, as that is no longer a thing. I talked
with @ ArcaneMusic about this, and they agreed, albeit with the caveat
that if someone finds a good use case for this feature, it could be
saved.

This PR also autodocs several export related files, and cleans up
various single and two letter vars.

## Why It's Good For The Game

Cleaner code, unused code removed.

## Changelog

🆑
code: cleaned up cargo export code a bit
/🆑

* Cargo category cleanup

---------

Co-authored-by: Profakos <profakos@gmail.com>
2023-05-14 16:02:52 -07:00
SkyratBot
d949b1b318 [MIRROR] Cargo: making requisitions form useful [MDB IGNORE] (#20347)
* Cargo: making requisitions form useful (#74510)

Adds better requisitions text, helping Cargo know what was ordered, by who, when, and what access was needed.

* Cargo: making requisitions form useful

---------

Co-authored-by: Aldimensch <aldimensch@gmail.com>
2023-04-05 11:34:32 -07:00
SkyratBot
320cb90555 [MIRROR] Thermomachines no longer self-destruct when built on blocked ports [MDB IGNORE] (#19664)
* Thermomachines no longer self-destruct when built on blocked ports (#73580)

## About The Pull Request

Ever felt the utter pain when you make a new thermomachine, hook it up
perfectly and then screwdriver it only for it to immediately become a
pile of iron and components without warning? This PR fixes that.

Instead of doing what it did previously, it unanchors itself and opens
its panel.

Right, almost forgot to mention, failing to wrench down a thermomachine
no longer bonks it with the wrench.

Due to not being allowed to use visual messages for when the port is
blocked, I've added a mob/user variable to all on_construction() procs.
(This allowed me to use balloon messages instead.)
## Why It's Good For The Game

Saves a lot of unnecessary headaches when working with thermomachines.
## Changelog
🆑
fix: Atmosians have finally convinced the thermomachines to not
self-destruct when built on blocked ports.
fix: Failing to wrench down a thermomachine no longer hits it with the
wrench.
/🆑

* Thermomachines no longer self-destruct when built on blocked ports

---------

Co-authored-by: RikuTheKiller <88713943+RikuTheKiller@users.noreply.github.com>
2023-03-04 19:53:44 -08:00
SkyratBot
39772c2258 [MIRROR] Cleaner UI for ordering Bulk amounts from cargo [MDB IGNORE] (#18594)
Cleaner UI for ordering Bulk amounts from cargo (#72423)

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
2023-01-19 18:12:09 +13:00
SkyratBot
d184bcec4a [MIRROR] Minor improvements to mining order console [MDB IGNORE] (#18467)
* Minor improvements to mining order console

* merge

* Mining orders can no longer error and don't say they charge you (#71676)

- Mining orders now show the amount of mining points spent as the 'Cost'
instead of a flat 240 credits

- Mining orders now no longer have errors (including nothing being in
the crate at all) because they can't be sent back for a full refund.

- Mining orders no longer say they charged you if they haven't.

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
2023-01-12 13:40:14 -05:00
StrangeWeirdKitten
93373deded [Kinda A Priority] Fixes Free Cargo. (#18353)
* nice

* Can we all agree cargo should be removed

* My brain is too small for operators

* should move this down
2022-12-27 13:22:10 -08:00
SkyratBot
4f597c227e [MIRROR] Fixes access_view on goodies not being respected by anything other than department budget orders [MDB IGNORE] (#18272)
* Fixes access_view on goodies not being respected by anything other than department budget orders (#72125)

## About The Pull Request

Fixes access_view on goodies not being respected by anything other than
department budget orders

## Why It's Good For The Game

Bugfix, per gitblame we simply never fixed this but we clearly intended
it to work this way per the variable comment description and the fact we
use it on the detective revolver

## Changelog
🆑
fix: Fixes access_view on goodies not being respected by anything other
than department budget orders
/🆑

* Fixes access_view on goodies not being respected by anything other than department budget orders

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2022-12-24 21:50:57 -08:00
SkyratBot
6f2ea4f81c [MIRROR] Investigate logs include ckey of source (if applicable) [MDB IGNORE] (#18066)
* Investigate logs include ckey of source (if applicable)

* Update code/modules/mob/living/carbon/human/human.dm

* Update code/modules/mob/living/carbon/human/human.dm

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-15 10:38:47 -05:00
Paxilmaniac
683601cd9f Gun Cargo Rework: Now with 90% less gun and 100% more stuff the rest of the crew can actually use (#17326)
* quick reorder

* nakamura part 1

* nakamura finished maybe

* blacksteel does not actually make black steel

* renames the folder, special metals part 2 for blacksteel

* WHERE WE PLAY NOTHING BUT ROCK, ROCK, AND MORE ROCK

* file pathing

* blacksteel done

* nri surplus start

* interest stuff, company flags, nri surplus completion

* deforest medical

* theres gonna be multiple nakamuras actually

* donk co

* the prices are behaving strange

* those are a tad expensive

* im so confused

* ticks the other companies to see if maybe they're responsible

* also maybe that?

* on jod bro they just needed to all be the same name

* kahraman mining tools

* nakamura tools

* nt-bolt defense equipment

* the two g*n companies

* ammo company

* good lord what is happening in there

* STOP TALKING ABOUT GUNS, IM TIRED OF HEARING ABOUT IT

* hopefully the last few bits of gun-centricity (i don think that's a word

* price adjustment

* changes what can be a freebie

* those should be the other way around

* well that'd just make the descriptions incorrect now would it

* 1st batch of changes

* pt2

* oopsies (makes every test fail)

* then king minos told me "DIE" and I was like 💀

* some of those things could cause problems

* they even spelled asbestos wrong

* ultrakrill (funny)

* i hate this dumbass """"""advanced"""""" ammo box thing

* nakamura was a bit hard to get interest from

* not much a fan of how interest goes down

* those mod cores should be cheaper

* again fuck this stupid ''''''''advanced'''''''' ammo box shit

* price adjustment

* misinput

* Update accretion_incompatibility.dm

Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-11-24 02:25:17 +00:00
SkyratBot
249d97e387 [MIRROR] Adds fax machines to the supply shuttle blacklist [MDB IGNORE] (#16186)
* Adds fax machines to the supply shuttle blacklist (#69766)

Fax machines being present on the supply shuttle creates a risk that there may be ways to send other blacklisted items to CentCom in order to gain access. The neatest and safest solution to this broad realm of potential exploits is to keep the fax machine from being able to get there in the first place.

* Adds fax machines to the supply shuttle blacklist

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2022-09-12 21:08:45 -07:00
SkyratBot
7559990f20 [MIRROR] [MDB IGNORE] Shuttle engine code improvement and fixes [MDB IGNORE] (#16116)
* [MDB IGNORE] Shuttle engine code improvement and fixes

* what even happened in shuttlepanel.dm

* should be the last few

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2022-09-10 18:28:57 -04:00
SkyratBot
6016cf97b4 [MIRROR] individual LOG_GAME [MDB IGNORE] (#15401)
* individual LOG_GAME

* e

* Update teleporter.dm

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-08-08 01:11:55 +01:00
SkyratBot
49df4e02f9 [MIRROR] Arconomy expansion pack 1: Convenience and Luxury goods [MDB IGNORE] (#14410)
* Arconomy expansion pack 1: Convenience and Luxury goods (#67417)

* Arconomy expansion pack 1: Convenience and Luxury goods

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2022-06-19 10:07:16 -07:00
SkyratBot
40e36b5c9f [MIRROR] Makes departmental budget accounts visible on command IDs, makes departmental budget mechanic more obvious in general [MDB IGNORE] (#13714)
* Makes departmental budget accounts visible on command IDs, makes departmental budget mechanic more obvious in general (#67035)

* Head ID reports dep budget

* Adds Dep. Budget shorthand name to ID examine where applicable

* Cleaner & more readable ingame and codewise

* Modifies Cargo requests console js to allow title modification, IRN modifies titles where applicable

* Better way of doing things

* QM gets Cargo's budget on ID

Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>

* pain peko

Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>

Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>

* Makes departmental budget accounts visible on command IDs, makes departmental budget mechanic more obvious in general

Co-authored-by: nickup9 <nicholas.shpetner9@gmail.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@ users.noreply.github.com>
2022-05-19 04:04:42 +01:00
Zonespace
349a3325ec Adds Gun Cargo (#12632)
* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
2022-04-23 17:34:08 +01:00
SkyratBot
729132a4e0 [MIRROR] Rebalanced Power consumption, increase for machines [MDB IGNORE] (#12930)
* Rebalanced Power consumption, increase for machines

* wew

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-20 17:07:14 +01:00
SkyratBot
5c315aed4d [MIRROR] Add undelivered departmental order crates and syndicate bombs to the shuttle cannot be sent message. [MDB IGNORE] (#11254)
* Add undelivered departmental order crates and syndicate bombs to the cannot be delivered message. (#64606)

* Add undelivered departmental order crates and syndicate bombs to the shuttle cannot be sent message.

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
2022-02-03 09:53:24 +00:00
SkyratBot
61ca3472ea [MIRROR] PURE Code Improvements to the Shuttle Subsystem [MDB IGNORE] (#10609)
* PURE Code Improvements to the Shuttle Subsystem

* modular updates

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-01-12 02:47:57 +00:00
SkyratBot
32bc1eea41 [MIRROR] More standard tgui input conversions [MDB IGNORE] (#10238)
* More standard tgui input conversions

* More standard tgui input conversions

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-24 21:33:32 +00:00
SkyratBot
6ebcfd6522 [MIRROR] Fixes a spelling mistake in cargo's error message [MDB IGNORE] (#10111)
* Fixes a spelling mistake in cargo's error message  (#63437)

I hate you all.

* Fixes a spelling mistake in cargo's error message

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-12-17 12:32:02 +00:00
SkyratBot
270a8253bf [MIRROR] Routine Cargo Departmental Deliveries [MDB IGNORE] (#9405)
* Routine Cargo Departmental Deliveries (#61992)

About The Pull Request

Document: https://hackmd.io/@ bazelart/HkY-SO9VF

Each department's request console is upgraded. Instead of making requests, they are only able to see crates related to their department that helps the department. They can order one for free (so not out of anyone's wallet) and it will arrive at cargo. Cargo gets the price of the ordered crate for bringing it to the department that ordered it (via an area check, of which the crate will remain locked until satisfied, emitter cracking aside).

Ordering a crate puts the console on a cooldown depending on the price of the crate ordered. The time ranges from 10 minutes at the lowest value, to capped at 20 minutes at 4x the default crate's price. the price in time follows a ease in out circular function, where the time increases slowly as the time goes up, but a lot in the middle. towards the higher end it slows down again.

Cargo will start with far less money, but this is countered by the new source of income.

Finish Mapping it
Finish tgui panel for department orders
Testmerge it for balance and feedback who cares

    Maybe give multiple destination areas, just in case one area gets obliterated who cares!

Why It's Good For The Game

Cargo starts with a budget to spend on themselves, which lets them order their department rewards before doing anything. There is no inherent reward to delivering to other departments other than social expectations of filling the job, which means cargo will simply ignore deliveries and requests if there are more self-important things going on, since those deliveries both cost cargo and do not help cargo in any way
Changelog

cl
add: replaced the request consoles in each department with department order consoles, which order for free on a cooldown. cargo gets these orders and delivers the crates, which are locked until delivery. upon delivery, cargo gets paid the value of the crate, and can then sell the crate back on the shuttle.
balance: cargo doesn't start with a budget, other departments get what their budget was split up amongst them
/cl

* Routine Cargo Departmental Deliveries

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-14 12:04:29 -05:00
SkyratBot
3ebb7b9e6d [MIRROR] Fixes #62719, exploit that let players order crates marked as special. [MDB IGNORE] (#9390)
* Fixes #62719, exploit that let players order crates marked as special. (#62723)

* Update orderconsole.dm

* Update orderconsole.dm

* Update budgetordering.dm

* Fixes #62719, exploit that let players order crates marked as special.

Co-authored-by: CocaColaTastesGood <47264839+CocaColaTastesGood@users.noreply.github.com>
2021-11-11 11:17:08 -05:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
Gandalf
8fe50110dc Reverts NTF roles and the NTF Cargo system pending OVERMAP. (#8342)
* EEEE

* Update CentCom_skyrat_z2.dmm
2021-09-23 01:17:59 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
1d74e3853c [MIRROR] Cargo console mail clarifications (#5622)
* Cargo console mail clarifications (#58822)

* Cargo console mail clarifications

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
2021-05-13 16:23:33 +12:00
SkyratBot
8abf71498a [MIRROR] (Minorly) Refactors the Cargo Console. (#5358)
* Turns constants into variables in the Cargo Console. (#58765)

* (Minorly) Refactors the Cargo Console.

Co-authored-by: BluBerry016 <50649185+unit0016@users.noreply.github.com>
2021-04-30 13:11:40 +01:00
SkyratBot
b261424aaa [MIRROR] Fixes a minor oversight with eigenstasium (#4587)
* Fixes a minor oversight with eigenstasium (#58069)

* Fixes a minor oversight with eigenstasium

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-04-02 01:35:55 +01:00
SkyratBot
d40b208a05 [MIRROR] Fixes cargo gas canisters not being purchaseable (#4551)
* Fixes cargo gas canisters not being purchaseable (#58028)

* Fixes cargo gas canisters not being purchaseable

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-03-31 18:22:53 +01:00
SkyratBot
49836e4fac [MIRROR] Adds explorer drones / adventures. (#4424)
* Adds explorer drones / adventures.

* Update persistence.dm

* Update asset_list_items.dm

* MAP RESET

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-26 15:49:44 +00:00
SkyratBot
c2d6dd7d75 [MIRROR] Fixes a ton of harddels (#4215)
* Fixes a ton of harddels (#57736)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* Fixes a ton of harddels

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2021-03-17 20:42:47 +00:00
SkyratBot
c765afc23d [MIRROR] Chef Produce Console, for cases where there are no botanists (#3786)
* Chef Produce Console, for cases where there are no botanists (#57298)

* Chef Produce Console, for cases where there are no botanists

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-03 03:42:00 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
SkyratBot
e0727dd6a4 [MIRROR] fixes various grammar issues (#2935)
* fixes various grammar issues (#56446)

fixes misspellings of 'permanently'
fixes grammar with bandaging wounds on yourself

* fixes various grammar issues

Co-authored-by: elle <54373583+dermondarble@users.noreply.github.com>
2021-01-29 12:06:57 +00:00
SkyratBot
4af1148b13 [MIRROR] Non-human mobs can now benefit from held id cards and economy. (#1603)
* Non-human mobs can now benefit from held id cards and economy. (#54647)

* Non-human mobs can now benefit from held id cards and economy.

* Moved these getters toward the upper end.

* oui?
...
dump eet.

* .tee pump
      ...
     ?iuo

* Non-human mobs can now benefit from held id cards and economy.

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-11-07 05:08:36 +00:00
SkyratBot
91aa966eae [MIRROR] Cargo can now once again accept requests with their own budget. (#1559)
* Cargo can now once again accept requests with their own budget. (#54748)

* Cargo can now once again accept requests with their own budget.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-04 00:30:43 +00:00
SkyratBot
a2749a7078 [MIRROR] fixed express consoles without weird conflicts (#1401)
* fixed express consoles without weird conflicts (#54481)

* fixed express consoles without weird conflicts

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-10-21 07:06:54 +02:00