Commit Graph

246 Commits

Author SHA1 Message Date
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
Ryll-Ryll
fc0b247738 rename 2020-07-11 23:23:23 -04:00
ArcaneMusic
57a7eee5ec Arconomy Productions presents: The Bounty Board (#51449)
* Startwork

* stopwork again

* AGAIN.

* Good place to call it for now

* Startwork but I actually put some work in

* The left list doesn't work, stop for now.

* God remind me to squash these commits later.

* Well, I think I can safely say I have actual work done now

* The post-Brisk iced tea patch.

* God damnit nothing works I hate this worl

* Good place to stop, stuck in a chronic error state

* I take it back now I need to sleep jesus god

* I am grown POWERFUL in my dispair

* FINALLY READY TO PR.

* Request order swap

* Update and tgui recompile

* Adds a kiosknet, so adding a new bounty alerts all the bountyboards

* Renames file, attempts to port to modular app too because fuck my life

* Fuckin feature creep I tells ya

* Removes an unused proc

* Rebuildin

* Hopefully updates tgui and fixes an easy runtime

* Finishes updating/conflicts

* Mapmerges my shit.

* Rebuilds tguiiiiiiiiiiii

* Updates tgui

* Updated once more

* merge conflict fixaroni

* God I wish that I had a game I was dedicated enough to finish in a single setting

* Rebuild of PR: You will (Not) compile

* Cobby's changes and Anturk's Suggestions.

* Should probably prevent a runtime.

* Rebuilds TGUI.

* Lets not delete my own files please god

* Style's changes

* ALL the warriors

* What if I didn't delete ZX's app sprites again

* Start workin on a text component later

* Makes some code suggestions, doing it all in UI will kill me

* tgui update

* DNM until I get this gosh darn text working.

* The changes that I need afaik

* And a tgui rebuild to boot

* When that program datum spoke to me, I felt that.

* Makes changes to text input sanity, Pray

* By god I think I've cracked the code.

* Had no idea you could atomize UIs like that, this is revolutionary

* Spaces

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-08 00:29:49 +03:00
skoglol
7c6211dcc5 Merge pull request #51989 from ShizCalev/inducer-fix
Fixes inducers not working on some stuff due to missing get_cell() checks
2020-07-06 23:05:19 +02:00
Bobbahbrown
787d44e077 html moment (#51956) 2020-07-06 22:35:06 +02:00
ShizCalev
c9b87df67e Fixes inducers not working on some stuff due to missing get_cell() checks 2020-07-03 01:13:07 -04:00
ArcaneMusic
94e3bb9b12 Converts the Cargo Bounties UI to TGUI and adds a modular app for it. (#51509)
* How did this take me like 3 hours but the bounty UI took 4 weeks like fuck

* Uses style's suggestions for UI cleanup.

* Rebuild TGUI

* Squiggly Brackets No. 1

* Squiggly Brackets No. 2

* Rebuilds tgui also sorry style I got lazy

* Another tgui update

* GREP?

* Rebuilds tgui again

* Rebuild yet again

* How'd you like a nice tender lambchop?

* Take me HOOOOOOOME country ROOOOOADS

* Updates with Anturk's changes.

* Removes unnecessary flex element

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-06-28 11:56:03 +02:00
zxaber
4156b79b94 Adds Syndicate tablets, replaces the pinpointer used by Nuke Ops (#51386)
* Synux

* cleanup

* I bet this merge conflicts

we hate tgui.bundle

* extra bits

* Syndix

* small fixes

* Summary (required)

* this linter drives me up the wall

* final touchups

* Forgot this thing
2020-06-22 16:24:43 -03:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
WarlockD
1d0cc0c715 Papers Please! Now with Markup...again! (#51534)
* Initial update

* tgui ofcourse

* Small fixes

* More lint fix

* Updated to support signatures and adding to paper

* Sign and adding to paper work, need to tune it a bit though

* Ok, signatures and adding work, still working on stamps

* Stamps now, fix rotate and cleanup tommow

* Alrighty!  Lets try for some testing!

* Stupid travis

* annnd the bundle

* Minor fixes

* DONE.  Still have some code cleanup, but all the major features work now

* Requested changes cleaned up formating

* Dammmn you bundle!

* Fixed the preview issue

* Updated bundle

* Ok, some more fixes and clean up

* Ugh damn you tgui bundle

* Update tgui.bundle.js
2020-06-17 11:55:58 -04:00
ShizCalev
1059a64a98 I before E, except after C. (#51543) 2020-06-10 23:23:50 +02:00
GoldenAlpharex
aecebb4d64 Identification Console PR (#51374)
About The Pull Request

It simply adds a new Modular Console Preset to the existing ones, fully outfitted to replace the current Identification Console in the Head of Personnel's Office and in the Bridge, and in most of the maps' Customs desks. Note that it doesn't replace them, it's just an asset right now so we can replace them with another PR, at the pace the map maintainers feel confident with. It has the ID Card Modification, Job Manager and Crew Manifest softwares on it by default, alongside the regular Chat Client.
The new Modular Console Preset can be found under /obj/machinery/modular_computer/console/preset/id, for all your map editing needs.
I'm planning to see if I can't make changes to the Departmental Consoles later on as well, so we basically can get rid of a console in every Head of Staff's office (except the HoP because there's only one), but that will require some additional coding to make it so it's not straight up some Identification Consoles that people with All-Access could use to print even more All-Access cards.
Why It's Good For The Game

I've basically just implemented something that I feel was meant to be implemented a while ago through the use of TGUI and Modular Computers, but never actually got done. The console doesn't have the glitches of the current Identification console, when you remove your ID after logging in and it just goes to a page saying that the address couldn't be found. The UI is much simpler, looks a lot better and is just overall an improvement.

Here's what the new UI looks like, for those of you that don't feel like checking out the PR in-game to know what it looks like:
image
image
Changelog

🆑
add: New Modular Console Preset added: /obj/machinery/modular_computer/console/preset/id
/🆑
2020-06-10 00:18:41 +12:00
ArcaneMusic
6ac1f5f9d2 Tools for your belt. (#51328) 2020-05-29 13:12:23 +08:00
zxaber
5a07c3f29a Adds two new modular apps: Lifeline for tracking suit sensors, and the Syndicate-only Fission360 for tracking nuke-related items (#51152)
About The Pull Request

    Adds two new modular computer programs. Both use the same underlying parts;
    -- Lifeline is an improved suit sensor tracker, showing where the target is on a grid if they're within 24 tiles. The scan button has a two-second delay (since the program has to check every humanoid in glob.human_list for trackability and we don't want that spammed). The app works pretty much how you would expect.
    -- Fission360 uses the same processes as above but for the nuke disk and all nukes in the area (self destruct, beer, syndicate). Available only via emagging a tablet for the moment.
    --
    Rudimentary multiZ support exists, in the form of replacing the crosshairs icon with an up or down arrow (once it's visible within the circle) to indicate if the target is above or below, if both the target and the computer are on a station Z level of some sort. Also, the grid lines are exactly two-tiles apart.

    Added support for programs to list special assets to load, so that we don't have to have every program loading all modular program assets. The radar apps use this to load the background grid and the too-far-away-to-display arrow.

Why It's Good For The Game

More modular apps are good. I'm hoping to see a syndicate-version of the modular tablet in the hands of nuke ops at some point, which is really where Fission360 will make sense. Otherwise, it's an extra tool for traitors with the nuke theft objective, I suppose.
Changelog

cl
add: Two new apps for modular computers are available: Lifeline for Medical, and Fission360 for anyone with access to the Syndicate repository. Lifeline is an improved suit sensors tracker, and Fission360 is the same but for nuclear-related things.
/cl
2020-05-27 15:36:28 +12: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
spessman-007
5ae305ec9f Resolve issues with incorrect usage of a/an (#51095)
Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 01:34:34 +08:00
vuonojenmustaturska
5e1f57de77 Speeds up area power usage handling, and apc process(). Cleans up related code (#51002)
About The Pull Request

/area/proc/usage() attempts to give list-like access to a bunch of vars. Why not make it a list instead and avoid all the proc calls? Might be room for followup here, to do something to powered(), use_power() etc.

Some legacy machinery was ignoring the default machinery use_power pulling from the machine's power channel by default

Total power usage was unused, APCs ignored it in favor of calculating it themselves :)

I also renamed the defines because they were in the danger zone of being very common words.
Changelog

cl Naksu
code: optimized area power usage calculations.
/cl
2020-05-11 11:33:56 +12:00
Iamgoofball
a3aa69701a [READY] Basically, Instant Explosions 2: The Search For More Money: Eternal: A Tail Of Two Kitties: 33 1/3 (#50594)
About The Pull Request

Extools maptick stuff is in the game. Stolen from BeeStation/BeeStation-Hornet#1119, improves performance. Requires ex-tools on the server, though.

Explosions have been refactored to do the actual exploding in a subsystem.

Credit to goon.

Here's some videos!

Why It's Good For The Game
Basically instant max-caps now.
We can now give more of a tick over to the sending of map updates

Changelog

cl Goonstation Coders, Beestation, Extools devs
refactor: Explosions have been heavily optimized.
/cl
2020-04-30 10:27:53 +12:00
zxaber
297207db42 Adds a Syndicate version of the Cyborg Monitor program (#50691)
* Done and done

* drops a file

* re-add the file a little
2020-04-27 08:27:42 +03:00
Aleksej Komarov
684ce3ff4a Achievements - Station Alert Console
Cheevos, AiAirlock/Restorer, Disposal, FileMan, NetDownloader/Monitor

Station Alert Console

Fix NtosAiRestorer

Remove deleted interfaces from routes.js
2020-04-19 19:36:42 +03:00
actioninja
b5dfd8880d id to component name 2020-04-19 19:36:35 +03:00
Timberpoes
ac11b2e1f8 Add flag (#50514) 2020-04-19 17:12:39 +08:00
ArcaneMusic
eca190ab9c Adds a new modular computer app, the Shipping Scanner App. (#50431)
* Had to put this on hold due to critical FUCK from hydriponics

* Another thing I'm being dragged away from

* Finally finished and happy with the result

* Merge issues: IRRADICATED.

* Made the UI a Labeled List per Stylesugestion

* Apply suggestions from code review

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Fixes up compile issues and tweaks tooltip/disable

* Rebuild tgui

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-04-09 05:32:16 +03:00
ArcaneMusic
04187f7363 Ports the Bot Control PDA program to Modular Computers. (#50351)
* Startwork.

* Time to break this later

* How do I map lists again

* So close I can almost TASTE ITTTT I GOTTA GET A MOVE ON WITH MY LIIIIFE

* Hey, it almost works!

* Finally actually ready to PR

* Nothing to see here but documentation and dead code

* Take 2.

* Revert "Take 2."

This reverts commit 0882d96a30ba79ebead4b5dd3e6f32e65bbf2a76.

* Cleans up tgui compile errors.

* WIP changes, still not happy with this for now.

* I am satisified.

* Rework that UI

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-04-09 05:21:21 +03:00
zxaber
4d3ae6a68c Adds a Cyborg Remote Monitor program for modular computers. (#50389)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* tablet good

* forgot something

* restoring what was lost

* hoping for the best

expecting the worst

* Why review when you can edit in place?

* Additions and fixes

* Here's hoping

* Why is this still here?

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-04-06 11:18:10 +03:00
ArcaneMusic
9566ff9785 NTOS Atmos Scan, now available for the modular computer. (#50365)
* NTOSAir, now available for 20,000 credits

* Copy progress bar code from NtosSupermatterMonitor

* Update code/modules/modular_computers/file_system/programs/atmosscan.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/modular_computers/file_system/programs/atmosscan.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-04-05 01:08:17 +03:00
Akrilla
954dc87cdd Contract tablet dropoff locator and other minor changes (#50259)
* dropoff and minor changes

* Update tgui/packages/tgui/interfaces/SyndContractor.js

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/antagonists/traitor/syndicate_contract.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* defines and build

* const defines

* Rebuild tgui

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-04-05 00:36:05 +03:00
Fikou
a59e4fb1b5 merges civilian and service departments (#50142)
* merges the service and civilian departments

* yee haw
2020-03-26 22:05:28 +08:00
Rohesie
d74c0bfba1 Merge pull request #50012 from kingofkosmos/time_tenses_to_present
Verb time tenses to present tense
2020-03-19 16:19:49 -03:00
nemvar
556e48b431 Heads can no longer grants all access. 2020-03-19 14:18:23 +01:00
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
Timberpoes
f5cb1d471b Fixes the handheld arcade game not working as intended (#49823)
* Fixes the handheld arcade game not working as intended

* Removed misleading parameter from ui_act

* Further fixes in light of build errors
2020-03-10 18:39:02 +08:00
Arkatos1
e9bc48632c tgui: AI system integrity restorer (#49828)
* AI fixer UI

* Cleanup

* Polish
2020-03-09 22:12:13 -07:00
spookydonut
49eab491b4 Gamer skill (#49618)
* gaming.dm added

* initial changes

* gamer god trait

* finalization after testing

* spellcheck + flavortext

* phone gamer support

* incorporates review suggestions

* tiny flavor change in pwr game desc

* more trait-related touchups and minor fluff

* adds and removes ?s where needed

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:06:33 +08:00
spookydonut
319ca52545 removing unnecesary double parent proc calls (#49694)
* removing unnecesary double parent proc calls

* i made an oopsie
2020-03-05 18:51:37 +08:00
AnturK
a2ff959950 Batch of runtime fixes. (#49568)
* Fixes secret sauce recipe paper.

* Fixes say runtime

* Fixes modular computer on holodeck runtime

* Fixes bee runtime

* Fixes grav holopara runtime

* Fixes olfaction runtime

* Fixes zombie runtime.

* Cleanup
2020-02-26 20:47:31 +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
ArcaneMusic
3caacfd7a4 Changes documentation to NTOS Arcade and fixes the boss HP bar. (#49425)
* Oh mother f-

* Holdover from testing.

* rebuilds tgui
2020-02-20 13:47:03 +01:00
Rob Bailey
e2e6a96d65 TGUI-NEXT: THE FINAL RECKONING (#49326)
* fuck it we're done

initial refactoring

wip

fasdf

ai restorer and file manager

fuck it we're done

* small fixes

* rebuild
2020-02-13 23:29:13 -05:00
Rob Bailey
62d1a3941c tgui-next ntos card console (#48938)
About The Pull Request

A PR now several weeks in the making that spiraled ridiculously out of control for something not many even use.
What else is new in NTOS hell?
I spent several days doing nothing but playing escape from tarkov so this took longer than expected I valiantly spent all night and day working on this, and barely finished it before The Deadline
the card ntos program was split into three programs, manifest, job management, and id card modification. It didn't make much sense for them all to be the same program imo, and made the project a bit more managable.

Airlock electronics saw some improvements as well since it uses this new access control section as well.

Yet again some new functionality and improvements to core components. Buttons now have an "altSelected" feature where instead of changing the color it adds a small white marker, among some other things.

There were a couple of small changes in inconsequential ways in other places, and datacore was refactored a tiny bit. Probably some other stuff I don't remember.

I would replace the old card console with a modular computer right now, but I know a few people actually use this program and want a bit of time to iron out bugs and inconsistencies before replacing the main job console with it.
Changelog

🆑
add: tgui-next NTOS card console, job manager, and crew manifest
tweak: airlock electronics interface is a little fancier

/🆑
2020-02-01 20:47:36 +13:00
spookydonut
ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
Rob Bailey
179ad7026c tgui-next ntos chat (#48734)
I put way too much effort into this.
Also some new generic components.
Who cares nobody uses this.
2020-01-12 18:08:23 -08:00
Rob Bailey
cbad6e4de5 Contractor Uplink tgui-next overhaul (#48453)
* tgui next contractor interface

work

cleanup

more work

getting close now

final

build

more stuff for wanted messages

rebuild

spelling

* fixes

* rebuild

* fix

* disable button when contract not active or extraction enroute, disable limited when depleted
2020-01-03 11:29:38 +01:00
Rob Bailey
d40713f70d Configuration + NTNet Relay (#48476) 2020-01-03 00:14:04 +01:00
Iain Price
85b4a62b09 Make fire alarm monitoring work at the area level (#48422)
* Make fire alarm monitoring work at the area level

* Use TRUE/FALSE for arealevelalarm
2019-12-29 10:19:57 -05:00
cacogen
6b63bf7093 Changes $1 to 1 cr (#48414)
* $ to cr

* Payday messages use a proper span instead of asterisks
2019-12-28 16:29:36 +02:00