Commit Graph

403 Commits

Author SHA1 Message Date
skoglol c3c96ad010 Delete a few forgotten VR files (#45963)
These files are already removed from the .dme, but werent deleted in 
the removal PR. Also some other references.
2019-08-18 10:53:35 -07:00
Akrilla 9ca37e9169 Contract rerolls and general enhancements (#45703)
* refactor wip

* rerolling and qol

* space not valid

* travis be nice

* comment?

* new tablet sprites

* Start on uplink screen

* new suit sprite

* paper

* merge conflict

* Auto stash before merge of "contract-reroll" and "tgstation/master"
2019-08-10 02:11:11 -07:00
skoglol 216a7ec316 Cargo console UI touchup (#45764)
About The Pull Request

Moves requests and cart below the cargo pack list, so you dont need to find the right button after everything you buy. Resized the cargo window, less airy. Added a toggle for buying privately, less buttons should improve performance somewhat.

Why It's Good For The Game
Less annoying UI.

Changelog

cl Skoglol
tweak: Cargo console UI touched up a bit. Requests and cart moved below the cargo packs for less button shuffling, buying privately is now a toggle, resized window slightly.

/cl
2019-08-09 13:15:02 +12:00
Time-Green b5159fbf31 [READY] Plumbing: Chemical Filters (#45473)
Adds chemical filters to the plumbing arsenal

They have one input, and three outputs. The left and right outputs can be given filters. It's basically the exact same as atmos filters but it has TWO filter sides.

It doesn't have an enormous list of chems to select from, you just enter a chem and it's added if it's valid.

cl
add: Adds chemical filters to plumbing
/cl
I was planning to do a bunch at once, but europe is on fire and im delirious

I also moved the existing unique plumbing datums into their own folder, wich was only chemical acclimators
2019-08-09 10:59:36 +12:00
Rob Bailey 2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
About The Pull Request

machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID

Also some backend refactoring to prisoner management and gulag teleporter consoles

hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog

cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
2019-08-04 22:53:55 +12:00
JJRcop 35e1898b94 Removes chem dispenser text macros (#45397)
About The Pull Request

This removes chem dispenser text macros and replaces them with a recording function. This allows you to still use macros, but you must record them yourself. You are no longer able to paste in a pre-written macro.

When the dispenser is recording, trying to dispense chems will record to the in-progress macro instead and won't dispense like normal. You can then save this macro when you're done recording and use it like you would before.

Using an existing macro while recording a new one will record the macro contents to the in-progress macro, and can be done multiple times.

It looks like this:

image
Why It's Good For The Game

It forces chemists and bartenders to learn the recipes for themselves first if they want to get the macros going quickly.
Changelog

cl JJRcop
del: Removed text macros from the chem dispenser.
add: Replaced with dispenser input recording macros.
/cl
2019-08-03 14:45:41 +12:00
Time-Green d4bfdd2a40 Plumbing: Chemical Acclimators (#45243)
* Finishes pump and fixes visual bug with disconnecting plumbing objects

* More bugfixes, finishes liquid pump

* Chemical synthesizer, wrench signal to handle unwrenching

* adds input and output pipes and changes ob into obj

* dmdocs all of plumbing through proper means

* adds sprites by meyhaza

also added wrenching interaction and fixed a dumb dumb with me fucking up an object path

* brightens the sprites a little by me

* removes big select from synthesizer ui

* update tgui.js thing

* unfuck pump color

apparently the replace all of spriting has downsides

* chemical acclimator

only heats and cools but i gotta commit and do other stuff

* finishes chemical acclimators

* uodates .dme

* updates .dme again

forgot plumbing component
2019-07-26 17:43:45 -07:00
Time-Green d18fe2101a [READY] Plumbing improvements and chemical synthesizers (#45185)
Removes dumb visual bugs.
Put the copy pasted wrench stuff for disabling and enabling the component, in the component using a new signal from default_unfasten_wrench.
Add a general plumbing machinery subtype. Right now it's mainly for cataloging.
Adds the chemical synthesizer. You can select a single chemical and an amount between 0 and 5. It will produce it every tick. Should be combined with other synthesizers to create meth factories.
Makes the liquid pump a fully functioning machine.

cl
add: The station comes one step closer to plumbing with the introduction of the chemical synthesizer.
sprite: sprites for the synthesizer, input and output commissioned by @Meyhazah
/cl

I wanted to do all the plumbing basic equipment at once, but stuff like plumbing heaters is gonna be ugly if I don't rework them completely and I don't wanna scare the maintainers away.

There is slight copypasting from the chem_dispenser and with the chem synthesizer, but having it be inhereted would be a worse clusterfuck IMO.
2019-07-23 21:22:16 +12:00
Tad Hardesty 9813ba6042 Compile tgui 2019-07-20 12:22:15 -07:00
Tad Hardesty 975604a015 Run npm audit fix 2019-07-20 12:22:08 -07:00
Akrilla 4dda76b8f1 [READY] Contractor Hub (#45117)
* Contract Hub + Pinpointer + more contracts

* Show rep

* Better errors

* Dynamic hub

* Bug fixes

* Show items

* No html in desc

* compile

* contractor support

* limit

* allow limits of 1

web edit

* Equip and send partner + turf helper

* working reinforcements

* Cleanup

* removing debug

* blackout

* test

* Working buttons

* no debug

* prelight

* finalized interface

* better fit

* hub icon

* conflict

* text

* error

* kit tweaks

* items

* fixup

* fixup

* bugfix

* ui fix
2019-07-15 20:36:54 +02:00
Tad Hardesty 575078f209 Compile tgui 2019-07-12 16:42:26 -07:00
Tad Hardesty 42dcbabdff Run npm audit fix 2019-07-12 16:41:11 -07:00
AnturK 0d5c0f16f9 Updates FontAwesome to 5.9.0 (#45031)
* removes duplicated tgui asset definition.

* Puts fa in separate asset

* Makes it work.

* Not needed anymore

* Removes brands css and font

* we're not using logos anywhere right

* duh

* Fixes the chat settings width while i'm at it.

* TGUI build
2019-07-10 22:27:53 +10:00
Time-Green ceeff661a0 [READY] Plumbing (#44833)
cl Time-Green
add: Adds plumbing pipes and some hidden plumbing related machines. They're not available in-game yet.
sprites: Geyser and geyser pump sprites created by Mey-Ha-Zah!
/cl
Adds the following objects:

    Fluid ducts . Like atmos pipe, but for reagents. They're smart and can be seperated by layer and color

    Geysers. They spawn on lavaland and can be harvested with liquid pumps or just beakers.

    Liquid pumps. For pumping geysers. They need to be on a wire node and connected to a duct network.

    Plumbable reagent dispenser subtype.

    New plumbing RPD specific RPD.

    Plungers. The reinforced plunger can be used for plunging geysers to activate them. They currently serve no other function and can't be worn as a hat yet.

They're all disabled and admin only.

Adds the following systems:

    Ductnet datum. They pretty much say "hey, we're connected"

    Plumbing component. You can turn any movable atom into a plumbable thing. Comes with overlays and everything. They're essential for everything that has input and outputs, except pipes. That means you can have machines connected to both atmospheric pipes and fluid ducts. They only connect with layer 3 ducts.

    Fluid subsystem that handles the processing on the plumbing machinery and other plumbing related stuff.

Basically atmospherics but with reagents. Reagents are pressurized and thus transferred instantly, to avoid those stupid leftovers in pipes no one likes. I am PRing it now because if I were to add a dozen or so associated machines, it would be too much of a pain to manage/review in one PR. It would also be a massive waste if people didn't even want it in the first place.

Also yes all of this works (as far as I know)

Things I plan to add in later PR's

    Layers / colors (maybe) done
    Machinery (Stuff like chemical processors, filters, special mixing chambers and factories)
    Make geysers more interesting, so chemists/atmostechs/cargotechs/assistants can go to lavaland and get some exotic stuff.
    Pipe fractures. Damaged pipes could do the cartooney water soaker beam coming out to shoot at people cause why the fuck not.

Code concerns:

    Connecting is handled through pipes only. Not sure if this is the best approach. This means plumbing devices cant directly connect to each other without pipes. I could add some exceptions to handle it. I could also take connecting away from pipes and make it a global proc, with alot of exceptions since it'd be handling both plumbing machinery and the ducts.

    Reagent transferring. Basically the transfer is instantaneous from A to B. I did this because stuff getting stuck in pipes could pose some serious mixing problems with chemistry, since it's alot more delicate than atmos. I could understand if people would want it to be like atmos. It wouldn't be difficult to change.

Also for testing I suggest you set the pipe_dispenser to category 3 to print fluid ducts. My tests were done with
/obj/structure/geyser
/obj/structure/reagent_dispensers/plumbed/storage
/obj/item/plunger/reinforced
/obj/machinery/power/liquid_pump
/obj/item/pipe_dispenser/plumbing
that and standard tools for setting things up
2019-07-09 11:58:02 +12:00
AnturK 991058be78 Fix building unminified tgui (#44923)
As if anyone will seriously debug this.
2019-07-03 18:07:21 -07:00
Akrilla eba239656f Contract QoL and fixes (#44705)
* QoL and location bugfix

* QoL and bugfixes

* Further fixes

* Name fix

* Text changes

* revert delay

* Same fix for returning

* description update

* New TC generation

* Slight delay for ransom cut, so they can hear the beep

* Give a written guide

* Third item

Alright I'm sold, let's try it

* Forgot to add text changes in line with the new item

* Merge conflict

* In datum
2019-06-22 19:13:06 +02:00
XDTM 423f6915d7 Launchpad Revival (#44522) 2019-06-22 15:34:20 +02:00
vuonojenmustaturska ef414ee4d7 [READY] Replaces mining points with money, adjusts gulag payout (#44507)
* woop

* adjust miner regular payout

* golem, orm upgrade changes

* liberator

* tgui.js
2019-06-18 10:17:34 -04:00
vuonojenmustaturska 58935e41c9 Fixes and speedups to spraycans/crayons (#44561)
* spraycan stuff

* tgui.js again

* Update text.dm
2019-06-18 15:25:49 +02:00
Tad Hardesty 06be8a91e6 Update npm dependencies of tgui (#44588)
* Run npm audit fix

* Remove deprecated gulp-cssnano

* Use a non-alpha gulp 4.0

* Compile tgui
2019-06-18 09:27:32 +02:00
Akrilla 041680be63 [READY] Syndicate Contracts (#44420)
* Emag bounty computer to show contract connection

* Corrupted text helper

* WIP on corrupted text

* Randomly corrupt text when looking at connect screen

* Barebones accessible Syndicate bounties screen

* Contract barebones and Synd UI work

* Further text changes, antag checks

* Further UI changes, full contract generation with areas/target

* dropoff point checks, and move to uplink item for requesting bounties

* WIP contract uplink item

* Contract uplink and continued contract improvements

* Completed contract uplink, and continued contract work

* Droppod WIP

* Further droppod work

* Mob WIP

* Further mob WIP

* No mob

* Callback for putting in mob

* Further WIP with pod checks

* Better location picking and signal fix

* Further pod changes, WIP of payouts

* Overall finished payment/contract system

* Code cleanup


Revert changes to bounty console


Remove debug messages

* Small refactor

* Add kit with set and randomised items.

* Fix box

* Very minor flavor text for inserting into pod, plus roundend text

* Pod return sound

* Contract uplink slight styling changes

* We don't keep giving telecrystals until they literally can't hold anymore

* Ship them off to ninja base instead

* Nerf bring them dead, but give a nice boost for bring them alive

Overall this is a nerf, so we also throw in an agent card to the bundle

* Ship them back

* Minor text changes and slight TC change

* Always give the black and red variant space suit

* Error sounds

* Dropoff area locator

There's sometimes duplicates, i.e. security office - but only one of them will work. This shows you where to go.

* Small fixes

* Bugfix, further changing of TC

* Ransom wip

* Ransom system

* Few changes

* Properly pay for ransoms and appropriate logic for dropoffs

* Terminal sounds

* Talk on command channel when ransom is given, or if they were too late

* Change to announce system

* Announcements/auto pay ransom

* Proper wait

* Name pods properly

* Don't send blacklisted items

* fix

* Improvements

* Announcements are less huge...

* Not a file...

* Improvement

* Drop them not in a wall

* Halves eye blur and styles payment vend

* No memes allowed
2019-06-17 20:32:46 +02:00
vuonojenmustaturska 6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
XDTM 5020a59565 Adds a communication remote that can send custom messages to some nanite programs (#43673)
About The Pull Request

Adds a new device, the nanite communication remote, which can be built from any protolathe once Basic Nanite Research is completed.
The Skull Echo, Forced Speech, and Hallucination programs can now be signaled by this new device to receive custom messages, instead of having to set them manually every time.
To do so, these programs must be set with a Comm Code, which will have to be signaled by a comm remote with the same Comm Code. A Comm Code of 0 is not signalable by remotes and will only work in the old way. If instead you want the program to be only activatable by remote, you must set the trigger code to 0.
Why It's Good For The Game

Makes these programs more elastic in use, allowing for example nanite-delivered private communication via Skull Echo, or actively messing up conversations with forced speech.
Changelog

clXDTM
add: Added a new device, the nanite communication remote, which can be used to send custom messages to message-based nanite programs.
add: Comm remotes use separate Comm Codes: for a message to be received, the signal's comm code must be the same as the program's.
/cl
2019-05-27 22:21:49 +12:00
zxaber 264a1ae108 [Ready] Cargo Catalog small-order support, new single-pack orders, addition of Ripley (#43402)
* Initial changes

* I need my scratchpad for another PR real quick

* Access and code shuffling

* First pass at small_item markers

* Second pass at small_item markers

I think I did this right...

* Maybe I should save the files I have open

* small pack additions

* Update tgui.js

* Removing some (imo) redunadant packs.

* removing 1911 pack

press F to pay respects

* missed a debug

* reorganization

* bit of cleanup

* removed some leftover disabled code

* That red X is bullshit and you know it
2019-04-25 12:25:12 -04:00
William Wallace 5dbd35b9c1 TGUI buttons do not fully grey out while the UI is still updating (#43540)
* desaturate TGUI buttons instead of disabling when status is UI_UPDATE

* TGUI buttons changed to stripped-out style and never fully grey out
2019-04-16 21:40:55 +12:00
oranges b526be704c TGUI and asset cache sending improvements (#43090)
Pills are now two spreadsheets instead of individual icons.

This reduces assets sent by about 19-20.

Furthermore tgui has been extended with a new proc ui_base_html which
allows a user to customise the html sent as the base for a tgui window.
This allows someone to provide custom spritesheet css as links in a
specific tgui window without having to add it to the global html.
2019-03-17 09:47:48 -07:00
as334 3237b64188 [Ready]Fusion V6: Chaos Hyper-Torus Edition (#42748)
* Fusion 6 begins.

* Adds location effects, updates analyzer feedback.

* Fixes a messed up prob statement

* Further work on reaction and some testing stuff.

* The debuggery continues

* Fusion continues

* Removes a check that's not longer relevant

* Tries to make filtering more possible

* More tweaks to make stable fusion more accessible, prevents a rare float overflow issue, makes unstable fusion less rewarding, reduces nuclear particle damage.

* Fixes my really poor implementation of the examine for volume pumps.

* Fixes an oopsie with probability

* Merge, and also tweaks instability scaling
2019-03-05 20:23:41 +01:00
MrDoomBringer a33052797c Gives the Centcom Podlauncher back it's old, sexy, chad UI. Also, prevents all tgui tooltips from FUCKING BLOCKING CLICKS REE (#42911)
* fuck yes


unfucks tooltips


700x700

* u got it anturk
2019-03-03 10:51:40 +01:00
ShizCalev 05f2ac7317 Cleans up (mostly) defunt crit_fail var (#42908) 2019-03-01 13:45:30 +01:00
MrDoomBringer 027b4f2bdd [RED LABEL] Allows badmins to launch shit in from orbit without it looking like its in a pod [activates standing tall for tatorfall] (#42773)
## About The Pull Request

Allows admins to make shit enter the station without pussy supplypods, instead they can just fucking flying in from the heavans
## Why It's Good For The Game

Cus it looks badass as fuck watching mechs just yeet in, also admins can spawn themselves in by literally falling from the sky which is funny
## Changelog

cl MrDoomBringer
admin: Admins can now use the Centcom Podlauncher to launch things without the things looking like they're being sent inside a pod.
/cl
2019-02-25 14:57:18 +13:00
MrDoomBringer e011cfe62b [RED LABEL][TESTED][SINGLE][READY][2][MINGLE] Adds an Supplypod Launch Bay specifically for ERTs or Deathsquads (#42614)
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* adds the room

* makes the boobs more seeable

* WHAT IS CONSISTENT PROC NAME FORMATTING FUCK FUCK FUCK

* adds fluff sign and fixes map a tiny bit

* small updates

* fuck FUCK YOUR MERGE CONFLICT FUCK
2019-02-14 21:12:55 +11:00
Jordan Brown fa27d64327 Rebuild tgui 2019-02-07 22:18:37 -05:00
Jordan Brown fdaa9eb7a4 Remove lodash vuln 2019-02-07 22:16:30 -05:00
unknown 2cb81e391a Regenerated previously erased tgui.js to fix PACMAN interface not working. 2019-01-18 01:32:16 +01:00
81Denton b5a2a3ab7e Adds hygiene and nutrition scan options to scanner gates (#42364)
* Adds hygiene scan to scanner gates

* Adds nutrition scanning modes

* Adds explicit selection for low and high hygiene levels

* ishuman()
2019-01-16 16:35:30 -05:00
Menshin 2699d01b4f * tgui'ed *P.A.C.M.A.N generators interface
* fixed a potential runtime related to soundloop on generators explosion
* fixed being able to connect an unanchored generator to a powernet through node cable laying
2019-01-09 10:13:09 +01:00
Qustinnus 14bd2ef2eb [Ready]You can now select what your pills will look like when making pills from the Chem Master (#41825)
cl Floyd/Qustinnus, paid for by Kryson
add: You can now select what your pills will look like when making pills from the Chem Master
/cl

we had 21 pill sprites and used 1. waste. now you can pick from our list of 21 and it'll show you beforehand what they look like

== Original commit names==

* pillshere

* names for fruit-kun

* they do

* they do

* done

* thanks mr mrdoombringer

* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* [maximum peepee]

* u got a boyfriend

i bet he ddoesnt kiss ya

* redpilled

* adds random pills

* boom

* mrdoombringer is fat
2018-12-16 12:57:36 +13:00
MrDoomBringer 8b49e62a49 Makes the tooltips less annoying in the Centcom Pod launcher verb (#41821)
cl MrDoomBringer
admin: The Centcom Pod Launcher has been reorganized, making it easier to navigate at the expense of compact-ness.
/cl

Each button in the podlauncher verb had a tooltip explaining what it did, however these would get in the way of selecting things, which made life a pain. This pushes all the buttons to the right, so the tooltips should now stay out of the way of selecting buttons.
2018-12-09 23:32:20 +13:00
Dennok 3288efcef1 Atmos tank console sensor fix. (#41674)
* atmos tank console sensor fix

* atmos tank console rate button

* up

* unhardcode MAX_TRANSFER_RATE

unhardcode some code
2018-12-02 09:57:28 -05:00
Jordan Brown f4dc7b5304 Fix tgui dependency vulnerability (#41480) 2018-11-15 10:14:55 +01:00
XDTM 1d4d5026f3 oh hey it was this (#41383) 2018-11-09 22:44:28 +01:00
XDTM c5ed65e7aa [Ready]Adds direct pay for cargo orders (#40684)
cl XDTM
add: You can now pay for cargo orders from your account with the cargo requests console. Credits will be detracted from the requester's account instead of the cargo budget. A 10% handling fee on top of the order will be paid to the cargo department budget.
add: Cargo employees must still accept the order for it to be delivered.
add: The delivery will arrive in a locked crate that can only be opened by an id with the paying bank account.
/cl

If you're wealthy, why should you waste your time waiting for cargo to get money? Pay for the stuff yourself; the quartermaster won't have to worry about their budget and will likely just put the order in the next shipment.
2018-11-07 21:58:17 +13:00
MrDoomBringer e7fa2bd458 [Tested] supplypod sound update (#40531)
cl MrDoomBringer
soundadd: Supplypods sound a bit nicer as the land now.
admin: admins can now adjust the animation duration for centcom-launched supplypods
admin: admins can adjust any sounds that are played as the supplypod lands
/cl
2018-11-04 14:46:22 +13:00
ShizCalev 1b95e4bd46 Fixes pandemics showing a clickable empty button when a beaker is already empty. Adds examine and altclick 2018-10-27 11:33:17 -04:00
ShizCalev b00d25a473 Fixes nanite chamber install program runtime (#40724)
Was checking against the wrong data.

cl ShizCalev
fix: Nanite chamber interfaces will no longer give you the option to install a program if there isn't one on the inserted data disk.
/cl
2018-10-17 23:21:45 +13:00
MrDoomBringer 6dbb565198 fixes centcom_podlauncher delimbing not working as expected, adds a new "Yeet Organs" option to the podlauncher (#40537)
Fixes #40535
cl MrDoomBringer
fix: Centcom-launched supplypods will now properly delimb you (if they are designated to do so) instead of touching you then literally yeeting all of your internal organs out of your body.
admin: Centcom can now specify if they want to yeet all of your organs out of your body with a supplypod
/cl

added a new button to the centcom podlauncher that cinematically removes every organ of whoever is hit by a supplypod
2018-10-17 23:17:47 +13:00
nicbn bcf4805a05 Makes fire alarm simpler (#40586)
* Makes fire alarm simpler

* Some final touches

* fixes maps

* Changes

* attack ai

* We compile tgui

* Decomplicates icon state
2018-10-09 10:53:02 +02:00
MrDoomBringer 6bc963bd57 Centcom Supplypods now come with a ghost announcement + follow link (#40720)
* asdf

* does it to you

* ahahwhups

* build dat ass
2018-10-07 06:45:16 -04:00
XDTM 1e7c87a9d7 [Ready for Review/Testmerge]Adds scanner gates (#39986)
* Adds scanner gates

* fix

* fix

* fix2

* fix3

* update!

* tgui build
2018-10-02 10:29:15 +02:00