Commit Graph

1128 Commits

Author SHA1 Message Date
TheGamerdk
5e514f81e7 Ports tgui-next 3.0, removes tgui 1.0 + Smart Asset Cache (#8291)
* Update Smes.js

* teleporter

* timer

* mining

* infra + prox

* uplink

* apc

* laser

* compile

* ui_x and ui_y and custom_materials

* 512

* smart asset cache

* vending machines

* Fixes missing icons. Removes rasta beanie

* cargo

* MULE + Intelli + Shuttle + Preferences

* AI fixer

* robot

* thing

* thing x2

* mecha

* compile

* oops

* Mining Vendor Fix

* Update traitordevices.dm

* Update proximity.dm

* Update EmergencyShuttleConsole.js

* rebuild

* uwu

* Revert "uwu"

This reverts commit de3ab5ff76.

* Update autodrobe.dm

* Update Vending.js

* Update _vending.dm

* Update Vending.js

* Update _vending.dm

* Build

* Update _vending.dm

* rebuild

* Update _vending.dm

* laser

* shuttle

* gigas

* signaller

* launchpad

* Update Vending.js

* eigthball

* pad

* ntnet relay

* labor stuff

* solar

* contrcators

* sprite fix

* Fixes contractor runtime (#45932)

* fix

* word change

* fixes contractor tablet (#47559)

* contractor

* ntos card console thing

* fixes

* dna console

* tweaks

* byondUI

* cargo hold

* fixes

* robit

* malf picker

* compile

* dependencies

* electropack

* transfer valve

* canvas

* fixes

* uplni stuff

* dna

* e

* tgui

* Octet separators in DNA Console genome sequencer. (#50516)

* Octet separators for the octet separator god.

* Code review changes

* REMOVES TGUI

* KNOB

* r

* tgui 3.0

* compile

* fixes

* fixes

* crafting fixes

* canister

* refactors

* bio gen

* MIT license

* seed

* Update NaniteCloudControl.js

* Update Uplink.js

* uwu

* oops

* fixes

* nanites

* Fixes nanite deactivation timer

* Revert "Fixes nanite deactivation timer"

This reverts commit c5fcfd34de.

* Revert "nanites"

This reverts commit eade3a61f4.

* various fixes

* compile

* turdis

* Update build_tgui.sh

* akwrard

* ha

* haha, HAHAHA!!

* compile

* fixes

* quick fix

* gps + dna fixes

* Compile

* DNA

* fixes

* sleeper + optable

* fixes

* mulebot

* Update cloning.dm

* Update cloning.dm

* Update ClockworkSlab.js

* Update Operating.dm

* Update nanite_chamber.dm

* Update nanites.dm

* Update nanites.dm

* Update stasis.dm

* Update asset_list_items.dm

* Update ClockworkSlab.js

* uwu

* oof

* Various FIxes + clockwork UI

* compile

* Sleeper fix

* Crew console

* AWKWARD

* PsiWeb

* uwu

* uwu

* psi web

* TGUI GONE

* compile

* autolethe

* Gulag + Solar

* Canister

* build

* private sale

* compile

* Update ntnrc_client.dm

* uwu

* canvas

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* uwu

* compile

* rust_g 0.4.3

* rust_g 0.4.4

* paint

* fixed

* icons

* Update easter.dm

* Update yogstation.dme

* asset cache

* Update asset_cache.dm

* opops

* hmm

* hm

* oh no

* awkward

* Update asset_list_items.dm

* hey

* Update asset_list_items.dm

* Update asset_cache_item.dm

* last try

* Update asset_list_items.dm

* fuck it

* hmm

* Update asset_list_items.dm

* uwu

* Update client_procs.dm

* Update PDA.dm

* no i didn't

* Update guardianbuilder.dm

* Update solar.dm

* Update minimap.dm

* Update _vending.dm

* tgui

* Update skin.dmf

* Update tgui.bundle.js

* Fixes

* Update borg_monitor.dm

* nanite fix

* Update rust_g.dll

Co-authored-by: Neo <26365368+Neo-0@users.noreply.github.com>
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: nightred <nightred@gmail.com>
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>
Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com>
Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
Co-authored-by: MrPerson <spamtaffic@gmail.com>
Co-authored-by: Akrilla <mrtactical@hotmail.co.uk>
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: WarlockD <warlockd@gmail.com>
Co-authored-by: XDTM <heliumt@yahoo.it>
Co-authored-by: Sanator <39862806+Sanator@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Kelenius <kelenius@ya.ru>
2020-06-14 17:52:52 -04:00
alexkar598
700df3f28a Auto kicks AIs that click turfs they shouldnt see(like for example when the camera static bugs out) (#8868)
* Auto kicks AIs that click turfs they shouldnt see(like for example when the camera static bugs out)

* Forces reconnect

* Update code/_onclick/ai.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-06-14 17:31:52 +01:00
Jumps
7025bb8052 Adds (a smaller) pAI button back to ghost hud (#8740)
* initial

* smol

* cha cha real smooth
2020-06-07 22:10:39 -04:00
Jumps
988de92174 initial (#8485) 2020-05-20 22:47:44 -04:00
ynot01
618b85502f Ports "slimes can now break walls with fugu gland #50837" from TG (#8378)
* Revert "update fork"

This reverts commit 67263d524d, reversing
changes made to e159e4b737.

* Revert "Revert "update fork""

This reverts commit e678f6f6da.

* Update other_mobs.dm

* Update other_mobs.dm
2020-05-05 12:54:26 -05:00
alexkar598
2333d64f09 Adds support for 513(and unicode), additionally drops supports for 512 in the process and updates dreamchecker(turdis) and casually fixes about 90 bugs in the codebase (#8324)
* Cherry picks the unicode part 2 PR from TG

* Things

* drop 512 support

* TAN --> tan

* Manually does the things that was in renamed files

* CLAMP --> clamp

* ismovableatom -> ismovable

* bugfixes, tg is bad

* Ports sanitize_name

* Bumps checks

* Fixes new linter errors (#48126)

About The Pull Request

This fixes the errors raised by the new feature I'm adding to the linter: SpaceManiac/SpacemanDMM#119

* Update SpacemanDMM suite to 1.2 (#48785)

* Update SpacemanDMM suite to 1.2

* Fix new lint errors

* Removes unreachable code (#48143)

About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123

* casually fixes 50 bugs

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* almost the same thing

* Makes all UIs UTF-8

* Fixes bugs

* Fixes runtimes, some related to 513, some not

* Fixes agent ids

Co-authored-by: MrPerson <spamtaffic@gmail.com>
Co-authored-by: alexkar598 <>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-05-02 00:43:42 -04:00
ynot01
a7202bfef4 Ports "Give a little #50710" from TG, an offer button (#8313)
* Offer

* updates

* F to C

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

Co-Authored-By: Hopekz <hopekxx@gmail.com>

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

Co-Authored-By: Hopekz <hopekxx@gmail.com>

* Update alert.dm

* Update alert.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>
2020-04-30 16:54:21 -05:00
Jumps
66ebfe7bc5 Minor fixes from TG (#8336)
* initial

* turdis wake up
2020-04-30 16:14:51 -05:00
Jumps
4a73ef7b4d Update radial.dm 2020-04-25 18:05:42 -07:00
alexkar598
295f875120 Removes april 2020-04-01 19:25:01 -04:00
fluffe9911
f3670a92d0 Revert "[s] Fixes yogstation revert" 2020-04-01 03:22:00 -04:00
fluffe9911
a0a9b7785c Revert "[s] Fixes yogstation" 2020-04-01 03:14:31 -04:00
fluffe9911
d3d406d709 fixed 2020-04-01 00:37:40 -04:00
Theos
b1241fd0d6 Ports guardian rework from hippie (#7201)
* HAND OVER THE STAND ARROW BUCCARATO

* a

* bruh

* missed

* whoops

* fuckit, stand meteors

* stupid academy

* stupid OTHER ACADEMY

* should probably work

* holyparasite stuff

* fukc

* Update holy_weapons.dm

* Update holy_weapons.dm

* Update holy_weapons.dm

* Update runes.dm

* Update runes.dm

* bruh

* finally actually fixes holyparasite and probably berzerk frenzy I guess

* buccarato

* stand meteor can spawn on meteor events sometimes

* random guardians

* runtime fix and actual pocket dimension work

* aaaaaaaaaaaaaaaaa

* fix some stuff

* Update time.dm

* Update time.dm

* Update time.dm

* Super vital fix

* guardian syndiekit

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Theos dies in the end

* bruh

* bruh

* aaaaaaaaaaaaaaaaaaaaaaaaa

* bruh

* Update CentCom.dmm

* Update holy_weapons.dm

* moves limited healing

* Update holy_weapons.dm

* update travids

* stands now lose their users on death

* Aaaaa

* ????????????

* ok

* May have been a bad idea not sure

* this would probably be a good idea

* fix stuff
2019-12-28 19:48:42 +01:00
Nichlas Pihl
5997752594 Merge pull request #7209 from yogstation13/513
513 (watch me break everything)
2019-12-10 16:32:44 +00:00
monster860
b216f996be fix the random parallax layers not working (#7225) 2019-12-03 14:59:04 -05:00
Nichlas Pihl
3044f49ff2 https://github.com/tgstation/tgstation/pull/47135 2019-12-02 20:45:47 +00:00
Nichlas Pihl
70f889cf7d Ports tgui-next (#7137)
* https://github.com/tgstation/tgstation/pull/46764

* tgui is shit

* next PR should be low-level stuff, to remove shim-console.js properly

* https://github.com/tgstation/tgstation/pull/47123

* mint scrapped

* lots of PRs

* more PRs finished

* lol at tg

* it just works

* well, now it works

* lol

* travis maybe?

* Update build_tgui.sh

* copies the tgui folder as well

* fixes tgui permissions

* removes mint properly

* lol

* more stuff

* lol

* fuck

* kiosk stuff apparently

* uplink

* turbine

* more stuffs

* removes plumbing

* lol

* Update machine_circuitboards.dm

* lol

* removes medical kiosk

* chem macros get out ree

* couple of extra PRs

* forgot the import

* nuke UI

* micro arcade

* last few PRs

* https://github.com/tgstation/tgstation/pull/47990

* forgot the .dm file
2019-11-28 23:15:34 +01:00
identification
804cf17a13 f 2019-11-24 13:46:15 +00:00
Nichlas Pihl
91501a9796 Merge pull request #7112 from SomeguyManperson/LEG
Port lavaland elites from TG
2019-11-22 23:57:35 +00:00
tgstation-server
ef02a90c84 [ci skip] Test merge commit for pull request #7070
Server Instance: yogstation
2019-11-21 16:30:20 +01:00
Theos
543360da64 Update screen_objects.dm 2019-11-19 02:28:56 -05:00
Theos
666cabd982 Im tired 2019-11-19 02:27:34 -05:00
yacabo
6e04a93a47 Changes (probably) all the times that Clock Cult uses watts to joules (#7052)
* Changes Clock Cult's watts to Joules

Changes (probably) all the times Clock Cult uses the term watts to joules

* Swing and a miss

I missed some
2019-11-15 17:33:22 -05:00
monster860
61ac3dc3b8 Replays 2019-11-13 00:19:57 -05:00
Katie
97a98ecfbf changes fire alert message (#6924) 2019-10-22 20:24:09 -04:00
Katie
26ab371f67 changes descriptions slightly (#6910) 2019-10-20 21:27:39 -04:00
identification
e427216630 the very concept stinks 2019-08-25 22:08:44 +01:00
alexkar598
fe934644ac Actually commits the line ending changes 2019-08-12 07:47:43 -04:00
Nich
0b875456e3 Revert "* extra spaces removed from "span class = '" --> "span class='""
This reverts commit 4ade98df11.
2019-07-16 03:34:48 +02:00
kingofkosmos
4ade98df11 * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-07-16 03:30:29 +02:00
vuonojenmustaturska
0c73eff422 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-07-16 03:20:17 +02:00
Flatgub
8c59afd881 Implements RCL radial wiring menu 2019-07-15 16:41:30 +02:00
yogstation13-bot
1914ab156c Removes the get_organ_target proc. 2019-07-04 05:36:56 +01:00
yogstation13-bot
9c18903922 [MIRROR] Action button swapping (#6044) 2019-06-23 15:23:56 -05:00
AsV9
4aee044700 Merge pull request #5984 from yogstation13/upstream-merge-44666
[MIRROR] SlimeHUD
2019-06-21 13:19:41 +02:00
ShizCalev
a782f7996c Merge pull request #44663 from XDTM/CtrlAlertMind
Hypnosis and Abductor mind control now have alerts
2019-06-20 23:13:12 +01:00
ShizCalev
7b13a9d5c1 Merge pull request #44666 from Arkatos1/SlimeHUD
SlimeHUD
2019-06-20 23:07:31 +01:00
AsV9
3cc9c1ecc7 Merge branch 'upstream-merge-44221'
# Conflicts:
#	code/modules/mob/login.dm
2019-06-20 13:08:10 +02:00
Joe Schmoe
a4bd03cab5 Gets rid of the GetComponent macros 2019-06-08 22:21:00 +02:00
oranges
c6d8fa88d0 Merge pull request #44209 from vuonojenmustaturska/blobrerolls
Buffs blob rerolls by allowing them to choose from 4 different strains
2019-06-08 01:08:36 +02:00
fluffe9911
9e1bc291f3 ok 2019-06-06 15:21:04 -04:00
yogstation13-bot
dd4b4a0524 Fixed menucrafting opening new window when finishing construction 2019-06-04 21:59:48 +01:00
yogstation13-bot
1bea91a404 [MIRROR] Widescreen toggle support (doesn't actually enable it) (#5659)
* Update config.txt
2019-06-02 22:36:49 -05:00
fluffe9911
63a99915e0 Merge pull request #5403 from yogstation13/upstream-merge-43741
[MIRROR] [READY] pAI HUD Overhaul
2019-06-02 20:13:20 -04:00
fluffe9911
aaa55be841 ok fixed that 2019-06-02 19:07:57 -04:00
Gary Lafortune
c64fdcd6d4 REGEX REPLACE! /([\w\.]+)\.has_trait\(/ -> /HAS_TRAIT(\1, / 2019-06-01 20:55:36 -05:00
yogstation13-bot
f53fe70506 [MIRROR] Click intecepts stop ghost teleports (#5634) 2019-06-01 20:28:38 -05:00
RaveRadbury
b868fe420c [READY] pAI HUD Overhaul (#43741)
* Initial overhaul work and some fixes.

Running into a bug with getting healthanalyzer variables to pass.

Signed-off-by: RaveRadbury <risforradbury@gmail.com>

* Fixes some typos, shortens a message

* Update pai.dm

* Prevents pAI OS from coming up in other windows.

* Moved around some camera stuff, trying to fix lost pAI zoom

* Fixes pAI zoom, adds camera flash

* PAI buttons grey out if they need software first

* Better greying out of buttons in PAI

* Removes unimplemented HUD stuff

* Should make pAI Host Scan require being held (like DNA check)

* Includes host scan as a greyed out hud

* Improved button loop

* Fixes pda icon off-set

* Fixed inconsistent indentation

* Replaces outdated and innacurate checks for scans

Thanks to Cobblestone for the help

* Refactor pAI hud button grey out

* Changes browse to browser

* cleans up the code, gets rid of an error

* Removes indent from #undef

* Removes an unneeded text-align:right
2019-05-19 16:13:47 +01:00
yogstation13-bot
334b5f62dd [MIRROR] pAI Journalism Update (#5269)
* [READY] pAI Journalism Update (#43654)
2019-04-28 14:06:34 -05:00