shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,384 Commits 5 Branches 0 Tags
d287fc25ca262fc89dd5905bf4e28c55d53e575a
Commit Graph
593 Commits
Author SHA1 Message Date
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy TeakettleandGitHub 5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork 
Re-Adding Bounty Consoles
 2023-02-11 00:06:37 +00:00
SandPoot b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
LinandGitHub a1cdb4705a Merge pull request #15955 from SandPoot/fix-surgery-ui 
Fixed the operating computer displaying alternative steps.
 2023-01-29 22:52:29 -07:00
siliconsandGitHub 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -08:00
siliconsandGitHub e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet 
Fixes the tablet pen buttons
 2023-01-29 13:42:29 -08:00
siliconsandGitHub 411bc2d81b Merge pull request #15925 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/follow-redirects-1.15.2 
Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui
 2023-01-29 13:37:34 -08:00
SandPoot 5ea481089b push 2023-01-28 21:36:23 -03:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot 32a36a1bfa put back 2023-01-27 23:03:47 -03:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
President of Shit PRS d063144713 Re-Adding Bounty Consoles 
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
 2023-01-14 02:01:12 +00:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
siliconsandGitHub a4de5f6e3c Merge pull request #15924 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2 in /tgui
 2023-01-07 13:53:18 -08:00
dependabot[bot]andGitHub 129a93c330 Bump follow-redirects from 1.13.2 to 1.15.2 in /tgui 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.2 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.2...v1.15.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-07 21:50:31 +00:00
siliconsandGitHub a12efc1790 Merge pull request #15905 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/nanoid-3.3.4 
Bump nanoid from 3.1.25 to 3.3.4 in /tgui
 2023-01-07 13:48:27 -08:00
siliconsandGitHub f6bed321cb Merge pull request #15904 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.7 
Bump minimist from 1.2.5 to 1.2.7 in /tgui
 2023-01-07 13:48:22 -08:00
siliconsandGitHub 87d6d97160 Merge pull request #15903 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimatch-3.1.2 
Bump minimatch from 3.0.4 to 3.1.2 in /tgui
 2023-01-07 13:48:16 -08:00
siliconsandGitHub 973bb93755 Merge pull request #15902 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/terser-5.16.1 
Bump terser from 5.7.1 to 5.16.1 in /tgui
 2023-01-07 13:47:53 -08:00
dependabot[bot]andGitHub 78bb808a7a Bump json5 from 1.0.1 to 1.0.2 in /tgui 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-07 20:27:40 +00:00
dependabot[bot]andGitHub fa544c56e6 Bump nanoid from 3.1.25 to 3.3.4 in /tgui 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.25 to 3.3.4.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.25...3.3.4)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-21 20:39:37 +00:00
dependabot[bot]andGitHub 04a70ed90b Bump minimist from 1.2.5 to 1.2.7 in /tgui 
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-21 20:39:17 +00:00
dependabot[bot]andGitHub cf9d3b3e2a Bump minimatch from 3.0.4 to 3.1.2 in /tgui 
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-21 20:39:08 +00:00
dependabot[bot]andGitHub 54629682d0 Bump terser from 5.7.1 to 5.16.1 in /tgui 
Bumps [terser](https://github.com/terser/terser) from 5.7.1 to 5.16.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.7.1...v5.16.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-21 20:39:06 +00:00
siliconsandGitHub 7dbba8d1dd Merge pull request #15881 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/xmldom/xmldom-0.7.8 
Bump @xmldom/xmldom from 0.7.5 to 0.7.8 in /tgui
 2022-12-21 12:37:31 -08:00
siliconsandGitHub 2d8a73a855 Merge pull request #15884 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/loader-utils-1.4.2 
Bump loader-utils from 1.4.0 to 1.4.2 in /tgui
 2022-12-21 12:37:17 -08:00
dependabot[bot]andGitHub a440952a14 Bump qs from 6.5.2 to 6.5.3 in /tgui 
Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-12 17:21:30 +00:00
Jerry Wester dae5190941 Remove sandstorm edit, fix suit storage 2022-12-11 20:45:46 -07:00
Jerry Wester 52aaef29f4 eslint throwing a hissy fit for some reason 2022-12-11 20:32:39 -07:00
Jerry Wester bbaf55a8f5 Fix pAI shenanigans 2022-12-11 20:32:38 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
dependabot[bot]andGitHub 6ab173d9f7 Bump loader-utils from 1.4.0 to 1.4.2 in /tgui 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-16 01:25:13 +00:00
dependabot[bot]andGitHub 3d26d406ea Bump @xmldom/xmldom from 0.7.5 to 0.7.8 in /tgui 
Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.5 to 0.7.8.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.7.5...0.7.8)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-01 18:46:55 +00:00
shellspeed1 40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. 2022-09-18 22:40:07 -07:00
shellspeed1 cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1GitHubPutnam3145SandPoot
 		d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847) 
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-09-17 13:33:51 -07:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Putnam3145 cdaefe18f6 needs filterMap 2022-08-07 17:32:19 -07:00
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
Putnam3145 2337939868 Nitrogen stuff second pass 2022-08-05 14:48:00 -07:00
siliconsandGitHub 35fba6aade Merge pull request #15675 from SandPoot/nice-ui 
Adds a search box and candystripes to Vending machines (all of them)
 2022-06-11 01:14:16 -07:00
siliconsandGitHub 63da07377b Merge pull request #15673 from deathride58/userfriendlycolormates 
User-friendly colormates - adds HSV coloration to colormates! (and more)
 2022-06-10 22:10:06 -07:00
SandPoot 2d2d36f940 push fancy stuff 2022-06-08 13:29:29 -03:00
SandPoot c6950fc8d5 some tweaks! 2022-06-07 21:08:15 -03:00
deathride58 fa24f1bd3a user-friendly colormates - adds HSV coloration to colormates! 2022-06-07 16:36:10 -04:00
deathride58 b14c534b37 adds suport for <hr> tags, makes examining use 'em! 2022-06-06 16:51:51 -04:00
deathride58 04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04:00