Commit Graph

236 Commits

Author SHA1 Message Date
SandPoot
8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -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
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -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
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
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
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07: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
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
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
silicons
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
The0bserver
f1109c4f67 what a crate day (initial commit) 2021-05-01 02:15:07 -04: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
silicons
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
qweq12yt
7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
Lin
05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
2021-04-04 23:18:55 -05:00
Hatterhat
8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
DeltaFire
1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
silicons
602140af99 Merge pull request #14497 from Hatterhat/lever-guns
.38 lever-action rifles but not actually implemented
2021-03-24 19:22:36 -06:00
Hatterhat
30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
kappa-sama
524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar
756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00