cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 05:39:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
1027 Commits
Author SHA1 Message Date
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
SandPoot 9d214e2f9d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-04-03 12:53:37 -03:00
LinandGitHub 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2 
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
 2023-04-01 00:17:22 -07:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
SandPoot 77969d5e2e yes 2023-02-21 20:43:48 -03:00
SandPoot 8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
SandPoot 9edcd1b353 fix it 2023-01-23 16:56:37 -03:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03: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
Putnam3145andGitHub 30236578c9 If you write a comment make sure the line's right 2022-12-05 20:26:12 -08:00
SandPoot 1607d9ead8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-19 00:54:33 -03:00
deathride58andGitHub 1c36a35d63 Merge pull request #15840 from Putnam3145/hard-cap-smatter-output 
Hard caps supermatter gas output
 2022-10-16 12:34:37 -04:00
Putnam3145 67f2dad1d7 stop stealing the furniture from my house 2022-09-28 12:41:56 -07:00
SandPoot a2baf4e789 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-28 15:14:24 -03:00
siliconsandGitHub 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
Putnam3145 eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03: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 b933545ba9 have to rebalance this too 2022-09-04 13:53:42 -07:00
Putnam3145 ff1de6e30a i forgot to actually push this change 2022-09-04 13:51:49 -07:00
Putnam3145 9f53a7f6da i did the math and it's not good 2022-09-03 23:44:27 -07:00
SandPoot 2d9b6d8fc5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-03 17:02:15 -03:00
Putnam3145 74a06748b3 need to qdel the radio 2022-08-28 16:08:41 -07:00
Putnam3145 1a20c527ed field generators now yell if they fail 2022-08-28 15:40:03 -07:00
SandPoot 105251893d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-01 12:45:35 -03:00
Putnam3145 f5ad5d711f parens... 2022-07-29 00:19:57 -07:00
Putnam3145 6b8a54fb57 i missed a bit 2022-07-29 00:19:24 -07:00
Putnam3145 297e901db3 Fixes rad collectors to use correct units 2022-07-29 00:15:34 -07:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 b02372afb0 minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more! 2022-06-04 22:44:15 -04:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-ShadeandGitHub d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot a9309c8c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-15 09:42:05 -03:00
Putnam3145 857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
Putnam3145 a44d0af4dc hackish supermatter dying on spaced nearby turfs 2022-03-09 07:49:02 -08:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
SandPoot bf69229ada Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-16 17:18:56 -03:00
silicons ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00