328 Commits

Author SHA1 Message Date
Metis 22ec293d45 the item 2024-11-15 00:21:13 -05:00
Metis 264cb5600f cryopods and TGUI 2024-09-26 16:30:19 -04:00
deathride58 587f92e900 Merge pull request #16092 from SandPoot/update_manifest
Crew manifest TGUI
2024-05-25 14:01:48 -04:00
SandPoot ad0f659226 push 2024-05-23 21:53:15 -03:00
SandPoot 9ba4dbb242 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-alerts 2024-05-22 00:31:41 -03:00
SandPoot 98b017831c final 2024-05-22 00:22:05 -03:00
SandPoot 04c8919e75 announcement side 2024-05-21 18:25:43 -03:00
SandPoot dcc2126b91 include help text 2024-05-21 15:18:00 -03:00
SandPoot 912ca1e374 poosh 2024-05-21 00:06:26 -03:00
SandPoot 9641f16807 push 2024-05-19 04:23:23 -03:00
SandPoot 1b40bf27c4 fix NOW!!! 2024-04-15 20:17:21 -03:00
SandPoot e8f490154f at the very least fixes tgui? 2024-03-12 21:37:22 -03:00
deathride58 3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs
Deals with lava plus a lot of borg stuff
2023-12-12 19:25:13 -05:00
deathride58 4baea8119d Merge pull request #16041 from SandPoot/fixing-chat-saving
Fixes chat log saving breaking because of unsupported CSS rules
2023-12-12 19:22:58 -05:00
SandPoot 06b45aa140 push 2023-12-12 15:04:38 -03:00
SandPoot c1ec13b1bf maybe final 2023-12-07 23:55:44 -03:00
SandPoot 00adad96ff c 2023-12-07 23:39:19 -03:00
SandPoot 0d8739aebf b 2023-12-07 23:37:04 -03:00
SandPoot d2039c33fe a 2023-12-07 23:24:08 -03:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
dependabot[bot] e16626ed4d Bump axios from 0.21.1 to 1.6.0 in /tgui (#16026)
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-13 13:26:39 +01:00
SandPoot 403c49afab push 2023-08-04 00:11:08 -03:00
Jerry Wester 908ac03b6d the ID lock doesn't even lock to your ID whats the 2023-05-01 00:20:26 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
SandPoot 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy Teakettle 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
Lin 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
silicons 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui
Event menu rewrite
2023-01-29 13:46:39 -08:00
silicons e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet
Fixes the tablet pen buttons
2023-01-29 13:42:29 -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 Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07: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
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
shellspeed1 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
silicons 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