Commit Graph

625 Commits

Author SHA1 Message Date
BongaTheProto
22e77d9504 a 2023-02-08 19:12:52 -05:00
BongaTheProto
79e84f961a le chars tm
how do you even reach the saves limit brah
2023-02-07 18:31:55 -05:00
BongaTheProto
7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
Darius
eb0b27889b Add Sandstorm balance config (#279)
* Add Sandstorm balance config

Allows changing settings for the Cryptominer, Autodoc, and Bluespace Miner.

* Update server config with real-time values

Sandstorm balance configurations have been updated to read values in real time whenever possible.

Values are now set using defines, and any that could not use them have been disabled.

A new configuration has been added to control when the bluespace mining machine can produce bluespace crystals.

* Fixes a critical cryptominer issue

Fixes a tremendous coding oversight that added two additional whitespace characters to the cryptominer machine file.

* Fix incorrect config value for BSMs

Fixes a mistaken definition for BLUESPACE_MINER_CRYSTAL_TIER pointing to a previously used value.

* Undefine balance config defines

Adds an undefine statement for all balance config value defines.

* Properly undefine definitions

Fixes incorrect term usage for undefining a value.
2023-01-29 22:29:33 -03:00
KathrinBailey
9d15297966 boxstation engines
two new engines:
diy - blank canvas to build your own stuff
diy_sm - an empty room with a crystal in it, make your own chamber!!

config changes
2022-10-16 23:06:38 +01:00
BongaTheProto
0669b85494 Update connections.txt
it troubles people doing things locally
2022-10-02 19:16:33 -05:00
BongaTheProto
9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot
4b42d228cb incorrectly named, would never work 2022-09-18 21:43:40 -03:00
SandPoot
cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03: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
BongaTheProto
304118c981 Merge branch 'master' into memotes-again 2022-08-29 10:47:14 -05:00
BongaTheProto
d05daefe81 why wasn't this added in first place
bruh!!!!!!!
2022-08-28 13:22:09 -05:00
BongaTheProto
bdb5a5bcb9 THE CONFIG
p
2022-08-24 20:15:41 -05:00
BongaTheProto
69d0eb78ed you ahelp for vpn now
because some people apparently need em
2022-08-21 21:33:31 -05:00
BongaTheProto
c9a6a22a38 New donator system
which uses toml files and allows integration with the previous one
2022-08-20 16:37:39 -05:00
BongaTheProto
57e8bcf010 enough is enough
vpns are gay
2022-08-18 22:55:56 -05:00
BongaTheProto
1a44bd3013 Merge pull request #434 from SPLURT-Station/spriting-thingies
Spriting thingies and other updates
2022-08-14 14:14:25 -05:00
BongaTheProto
8aad94866a podpeople hairs + markings
me omw to force all pod players to change their species
2022-08-07 16:59:33 -05:00
BongaTheProto
2798909614 fixes 2022-07-24 18:08:24 -05:00
BongaTheProto
8508ae5eee Merge branch 'master' into uhhhh-test 2022-07-24 17:52:54 -05: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
BongaTheProto
97bf77f699 Merge branch 'master' into uhhhh-test 2022-07-23 23:31:41 -05: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
16ecfb8078 Merge pull request #359 from Yatiyaya/Zombie-unfuckery
Updating the zombie race to support modular creation
2022-07-15 18:10:11 -05:00
Nasumy
0558b663f1 Adding plushies
Yes, plushies
2022-07-09 21:39:43 -04:00
BongaTheProto
ca27490e5c Merge branch 'master' into uhhhh-test 2022-07-09 17:30:45 -05:00
BongaTheProto
63e9e61921 file limits
because we don't need even more lag
2022-06-30 17:23:03 -05:00
BongaTheProto
2dc9b2a461 Merge branch 'master' into uhhhh-test 2022-06-30 03:01:05 -05:00
BongaTheProto
972574e314 coomstation
COOM COOM COOM
2022-06-26 13:17:06 -05:00
BongaTheProto
fcb5e74eb6 Boxes some stations in
(BoxedInStation)
2022-06-25 12:27:26 -05:00
BongaTheProto
e9ebc630da code issue
adds the support in the code
2022-06-23 11:51:45 -05:00
BongaTheProto
385b4efc5d Merge branch 'master' into pr/340 2022-06-20 01:25:23 -05:00
BongaTheProto
375c0f2634 Merge branch 'master' into pr/359 2022-06-16 16:43:41 -05:00
BongaTheProto
ba6bb76258 maybe less lag?
limits the amount of infinidorms for good
2022-06-16 02:39:56 -05:00
BongaTheProto
e566d94019 better safe than sorry 2022-06-11 23:34:14 -05:00
AshTheDerg
3b081af15b Peacekeeper Redo 2022-06-10 23:50:51 -04:00
BongaTheProto
814364c814 cit already had their own railings
this may fuck up lambda
2022-06-04 20:15:33 -05:00
Bangus
1567f9366d Merge branch 'Zombie-unfuckery' of git merge --abort://github.com/Yatiyaya/SpurtStation into Zombie-unfuckery 2022-06-04 01:17:11 -04:00
Yatiyaya
de54b59ef0 Merge branch 'SPLURT-Station:master' into Zombie-unfuckery 2022-06-04 01:09:48 -04:00
Bangus
460eb75f5a Bunch'a changes and additions. General improvements 2022-06-04 01:04:09 -04:00
BongaTheProto
53fa6873d1 Merge remote-tracking branch 'upstream/master' 2022-06-02 09:57:31 -05:00
Yatiyaya
6229e3124d Update general.txt 2022-06-02 09:28:07 -04:00
Bangus
fecb5fa63b Updating the zombie race to support modular creation between anthro mammal/insect races since the current high-functioning zombie is a defunct halloween species from years ago. 2022-06-02 01:25:04 -04:00
SandPoot
d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
Lin
becb035529 Merge pull request #15632 from deathride58/botrefresh
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-06-01 21:18:10 +00:00
BongaTheProto
be74edefd0 Merge branch 'master' into prefs-update 2022-05-28 02:06:44 -05:00
AshTheDerg
1ad13b683f Cog Station Rework
Allow Cog to be picked
2022-05-27 15:10:54 -04:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
deathride58
ccc5ea1758 Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role 2022-05-19 15:19:21 -04:00