Commit Graph
273 Commits
Author SHA1 Message Date
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03: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 d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03: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 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
deathride58 578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
BongaTheProto 520c3f7da3 Merge remote-tracking branch 'upstream/master' 2022-03-23 07:26:49 -05:00
SandPootandGitHub 8359e0cce8 Fixes uplink items fetching (#237)
* Upload files

* flags, not items
2022-03-22 18:13:44 -03:00
BongaTheProto 9ce527e068 Merge remote-tracking branch 'upstream/master' 2022-01-26 00:20:29 -05:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
FLME fb6242c683 now_we_can_stop_asking_the_admins
What the fuck did you just fucking say about me, you little bitch? I'll have you know I graduated top of my class in the Navy Seals, and I've been involved in numerous secret raids on Al-Quaeda, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire US armed forces.
2021-12-22 19:55:50 -06: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
SandPoot e5badd2e09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 13:31:55 -03:00
siliconsandGitHub d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07:00
SandPoot ecee82ed75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-12 12:55:02 -03:00
Putnam3145 dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
SandPoot e3c17dc05e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 01:57:47 -03:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
SandPoot 167ada9e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-13 23:17:50 -03:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
siliconsandGitHub 4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
SandPoot dfdcbdbb32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-04 01:33:18 -03:00
The0bserver f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04:00
SandPoot 13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
The0bserver db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
The0bserver 892dcaf976 dumdum crate now dumdum crate dumdum 2021-04-21 02:31:44 -04:00
The0bserver 7102ec121c missed one. 2021-04-21 02:31:08 -04:00
The0bserver 4e3ab78ebd Best to look the part. 2021-04-21 02:25:55 -04:00
The0bserver 57e0056ffc Spain without the S (Initial Commit) 2021-04-21 01:46:33 -04:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
siliconsandGitHub 0dcc6b44ba Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
2021-04-18 18:52:54 -06:00
The0bserver 64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver bcbccd864f I'm going monkey 2021-04-13 19:46:07 -04:00
The0bserver 2046ca2eb2 a test 2021-04-13 19:42:07 -04:00
The0bserver 2e65dbf07f Mandrill Maze 2021-04-13 18:45:01 -04:00
The0bserver 4b888fe715 Emag Crate 2021-04-13 18:28:58 -04:00
qweq12yt c392d6e888 fix issue 2021-04-08 21:40:51 -03:00