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
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
522 Commits
Author SHA1 Message Date
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 0ba01a977d repath on maps 2023-12-17 23:53:03 -03:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
shellspeed1andGitHub 912e0b3d51 Update lavaland_surface_seed_vault.dmm (#15835) 2023-11-13 10:18:43 +01:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
dapnee 5251c14f65 Letting that sink in 
idk why this was never fixed
 2023-01-13 16:59:27 -07: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 ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship 
Ports random whiteships from tg
 2022-10-16 13:07:07 -04:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
shellspeed1 dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
shellspeed1 95a775edf1 woopsie I forgot map stuff 2022-09-18 23:04:29 -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
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
TripleShades af197ce22e lizard man points local mapper at the debug tools 
local mapper goes FUCKING BONKERS
 2022-03-29 02:12:32 -04:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
SandPoot 086e3bc704 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-09 23:40:45 -03:00
LinandGitHub d7cbb017f6 Fix few instances of bleeding white blood (#15398) 
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
 2022-01-09 17:23:48 +01:00
SandPoot 2c4fcaba81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 15:04:36 -03:00
Chayse RamsayandGitHub d1611ddf42 Lavaland ruin rad storm fix (#15242) 
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
 2021-10-06 17:28:29 +02:00
SandPoot 918f305bca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-27 21:33:56 -03:00
zeroisthebiggayandGitHub 41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210) 
* .

* .
 2021-09-27 17:49:01 +02:00
SandPoot ed83bb4b24 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-05 00:45:29 -03:00
Emily 04284f8025 Un-Spaces the Library and also removes some leftover snow. 2021-09-02 20:11:49 +02:00
SandPoot a9e4dd336c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-06 13:58:02 -03:00
SandPoot 5dc5af9946 update lavaland stuff 2021-08-06 13:51:26 -03:00
Artur 772bfaba75 line ending fuckery 2021-08-03 00:59:48 +03:00
SandPoot db635eb649 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-30 15:03:33 -03:00
siliconsandGitHub c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland 
[Review/Testmerge] Icemoon Ruins but on Lavaland!
 2021-07-29 22:39:42 -07:00
SandPoot 6f460e9a89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-08 22:53:04 -03:00
MrJWhit 26b186d24f Update engine_am.dmm 2021-07-06 16:29:45 -04:00
SandPoot 591090641e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-04 15:53:12 -03:00
siliconsandGitHub 472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools 
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
 2021-07-04 10:59:43 -07:00
SandPoot 3c7a878c8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-24 21:58:46 -03:00
LinandGitHub 2064da4842 Merge pull request #14887 from MrJWhit/teg-reinforced-floors 
Swapping some floors on the TEG-map
 2021-06-24 14:45:53 -07:00
MrJWhit 084ec04782 Update engine_sm_5x5.dmm 2021-06-23 12:51:30 -04:00
MrJWhit b5e38ba4b3 Update engine_teg.dmm 2021-06-23 02:07:59 -04:00
WanderingFox95andGitHub 74ae090f8f Now it shouldn't spawn plating around the shack. 
kinda ruins the immersion.
 2021-06-23 03:14:16 +02:00
WanderingFox95andGitHub 2f801dd9a3 Not needed. Was just big and empty anyway. 2021-06-22 17:18:02 +02:00
WanderingFox95andGitHub f15a1d551c Miner in the mining site, no more underground needed. 2021-06-22 17:17:28 +02:00
WanderingFox95andGitHub 130d617842 I missed two frozen tiles, woops. 2021-06-21 17:27:58 +02:00
WanderingFox95andGitHub 0a136d9669 Adds safe ruins as lavaland ruins. 2021-06-21 16:38:41 +02:00
SandPoot 70e50583e9 a 2021-06-19 21:33:09 -03:00
zerothebigboy e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
SandPoot 0b42627a61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-03 16:50:59 -03:00
MrJWhit fe9fdf0975 Update lavaland_surface_alien_nest.dmm 2021-06-01 11:26:46 -04:00