Commit Graph
252 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
BongaTheProto d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot b62b5c3e12 fix more alt titles 2023-02-11 14:02:22 -03:00
BongaTheProto 2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05: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
BongaTheProto 8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
SandPoot 32a36a1bfa put back 2023-01-27 23:03:47 -03:00
BongaTheProto 620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot 0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Neyusha 580bd31e12 Stowaways Role 2022-12-27 11:45:20 +03:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProtoandGitHub a1c93d4767 Merge branch 'Sandstorm-Station:master' into master 2022-11-09 19:12:06 -05:00
HatterhatandGitHub 4a8abd0843 Revert "no more free money (#15375)"
This reverts commit cb1848d06c.
2022-10-31 00:01:44 -05:00
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05: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
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
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
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
Putnam3145 5b221dc354 Makes signal commander work 2022-08-18 23:01:47 -07:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05: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
Letter NandGitHub b6d62780c2 fix 2022-08-04 11:06:16 +08:00
AshTheDergandGitHub 4be32ed573 HoP Tablet Fix
HoP's tablet doesn't get a secondary Card Reader by default? Problem solved.
2022-06-11 00:56:25 -04:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
BongaTheProto 8652fc82a9 was less than I thought
yeah this works ig
2022-05-09 17:33:28 -05:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
DeltaFireandGitHub cb1848d06c no more free money (#15375) 2022-03-13 12:50:30 -07:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
DeltaFire 6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
LetterN a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN 99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Hatterhat 9dbcfa24a5 i only KINDA tested this 2021-09-07 22:28:04 -05:00