Commit Graph

2872 Commits

Author SHA1 Message Date
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -07:00
silicons
ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2
Updates auxmos to 2.0.0
2022-09-23 16:20:31 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
2022-09-23 16:16:03 -07: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
shellspeed1
236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -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
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1
1130a9341e now it actually works 2022-09-09 20:02:45 -07:00
shellspeed1
f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
Putnam3145
3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07:00
silicons
18b797d0f4 Merge pull request #15758 from LetterN/patch-12
fix pod not unlocking on code delta
2022-08-20 12:27:11 -07:00
Putnam3145
6340292604 Makes linux performance on startup better 2022-08-17 22:56:02 -07:00
Putnam3145
047c6a2a21 removes some duplicate signals 2022-08-07 18:00:53 -07:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Letter N
29324f5e47 lazy implementation 2022-08-05 22:29:11 -07:00
silicons
5280ae388f Merge pull request #15742 from timothyteakettle/vtuber-ai
lets AIs control status displays (vtuber mode)
2022-08-02 23:06:02 -07:00
Lin
b1eb485eeb Merge pull request #15741 from Putnam3145/another-minor-bomb-nerf
Another minor bomb points nerf
2022-08-02 22:57:23 +00:00
Timothy Teakettle
0e20cff184 vtuber mode 2022-08-01 12:58:41 +01:00
Putnam3145
91f61cc89b if you don't squash this i will be mad 2022-07-31 22:11:15 -07:00
Putnam3145
d5141d57e9 best not to shake things up too hard 2022-07-31 22:10:49 -07:00
Putnam3145
f7ac016658 Another minor bomb points nerf 2022-07-31 22:08:27 -07:00
SandPoot
b1f10e164e bitfields 2022-07-31 04:49:25 -03:00
SandPoot
329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
deathride58
e529e78b2c Merge pull request #15690 from Putnam3145/qcd-nerf-wah
Nerfs quark matter's value a lot
2022-07-19 19:23:38 -04:00
Putnam3145
858333295b I miscalibrated QCD's difficulty a bit 2022-06-13 19:14:25 -07:00
deathride58
73ec43f997 bark queue signals 2022-06-13 17:42:57 -04:00
deathride58
17917ed564 bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, etc! 2022-06-11 19:39:48 -04:00
silicons
59a7ab04da Merge pull request #15677 from deathride58/vocalbark
Vocal barks - Fully customizable noises for talking!
2022-06-10 22:10:44 -07:00
deathride58
071472aeb9 Merge pull request #15674 from Putnam3145/qcd-rebalance
Rebalancing QCD matter a bit
2022-06-11 01:07:55 -04:00
deathride58
381c8fe183 additional cleanup - turns bark variance into a macro for easy consistency 2022-06-10 04:05:02 -04:00
deathride58
512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
deathride58
2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
Putnam3145
6fe08f0a4e Rebalancing QCD a bit 2022-06-06 20:41:10 -07:00
deathride58
134425634f Merge branch 'master' into update-smooth-movement 2022-06-05 00:45:45 -04:00
deathride58
e75c413d42 Merge pull request #15652 from SandPoot/title-screen
Updates the title screen
2022-06-05 00:27:44 -04:00
deathride58
ca879a83f5 Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones!
adds paper skin and glass bones quirks
2022-06-05 00:26:55 -04:00
Lin
37cd25109e Merge pull request #15634 from deathride58/jukeboxrefresh
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
2022-06-01 21:18:02 +00:00
SandPoot
8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
Timothy Teakettle
411a5c63ee paper skin, glass bones 2022-05-29 20:04:49 +01:00
SandPoot
fd676bfe50 Upload files 2022-05-24 13:08:27 -03:00
Putnam3145
578415d3fc adds milk to pool blacklist 2022-05-22 04:42:40 -07:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
Lin
e8947a4e4d Merge pull request #15624 from timothyteakettle/better-quirk-menu
quirks are now organised into three tabs for positive, neutral and negative
2022-05-18 03:29:07 +00:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
Timothy Teakettle
1c9f6077da loadout organisation 2022-05-16 21:22:22 +01:00
Lin
a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00