Commit Graph

47029 Commits

Author SHA1 Message Date
CitadelStationBot 0e52fe2c09 Automatic changelog generation for PR #15843 [ci skip] 2022-09-23 18:21:02 -05:00
silicons 27231ce663 Merge pull request #15843 from zeroisthebiggay/cumb
HUD desoulification fan fiction
2022-09-23 16:20:59 -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
Changelogs c5a5c7e8f6 Automatic changelog compile [ci skip] 2022-09-23 01:02:34 +00:00
CitadelStationBot c881767842 Automatic changelog generation for PR #15852 [ci skip] 2022-09-21 23:32:15 -05:00
Lin 8c5b9f3307 Merge pull request #15852 from shellspeed1/a-few-speech-verbs
adds bellows, mumbles, and crackles as speech verbs
2022-09-22 04:32:12 +00:00
Putnam3145 1ac44f22c8 i am wont to make the worst mistakes 2022-09-21 17:55:34 -07:00
Putnam3145 223307aaa8 i need to reimplement this joy 2022-09-21 17:43:37 -07:00
shellspeed1 4aad87092d Merge branch 'master' into a-few-speech-verbs 2022-09-19 14:06:50 -07:00
shellspeed1 4bade2b1c6 merge conflict fix 2022-09-18 23:10:00 -07:00
Putnam3145 5ed2033f51 help me! i'm 2022-09-18 19:02:03 -07:00
Changelogs e5c562b4bc Automatic changelog compile [ci skip] 2022-09-19 00:59:16 +00:00
Putnam3145 dafe4477e5 at least it looks good on my resume 2022-09-18 16:45:08 -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 fa9bbfaedf Revert "Update auxmos to 2.0.0" (#15859) 2022-09-18 16:40:45 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
CitadelStationBot 3b82e20a31 Automatic changelog generation for PR #15826 [ci skip] 2022-09-18 00:45:01 -05:00
Lin a0bc2c1e09 Merge pull request #15826 from Putnam3145/auxmos-2
Update auxmos to 2.0.0
2022-09-18 05:44:58 +00:00
shellspeed1 4ddd0e76cc Update flavor_misc.dm 2022-09-17 19:57:26 -07:00
Changelogs 96789fc978 Automatic changelog compile [ci skip] 2022-09-18 01:01:27 +00:00
CitadelStationBot 8ad8c53b91 Automatic changelog generation for PR #15850 [ci skip] 2022-09-17 18:13:44 -05:00
Lin 07484bb09f Merge pull request #15850 from Putnam3145/bastion-bourbon-shitcode
fixes the worst use of a for loop ever
2022-09-17 23:13:41 +00:00
CitadelStationBot 952d09a63f Automatic changelog generation for PR #15834 [ci skip] 2022-09-17 15:47:27 -05:00
Hatterhat 1f0ad3e68c its a lil janky but we take those (#15834)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2022-09-17 13:47:24 -07:00
CitadelStationBot ff2555afc6 Automatic changelog generation for PR #15845 [ci skip] 2022-09-17 15:44:32 -05:00
shellspeed1 b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
CitadelStationBot c166f06e51 Automatic changelog generation for PR #15844 [ci skip] 2022-09-17 15:40:34 -05:00
shellspeed1 236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -07:00
CitadelStationBot 6836ea7951 Automatic changelog generation for PR #15846 [ci skip] 2022-09-17 15:39:35 -05:00
shellspeed1 d83747dc74 Ports Quantum Spin Inverter from TG. (#15846)
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
2022-09-17 13:39:32 -07:00
CitadelStationBot db846b52d3 Automatic changelog generation for PR #15837 [ci skip] 2022-09-17 15:37:58 -05:00
shellspeed1 a3c01b96f3 Update xeno.dm (#15837) 2022-09-17 13:37:55 -07:00
CitadelStationBot 3ad5458824 Automatic changelog generation for PR #15847 [ci skip] 2022-09-17 15:33:54 -05: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 cf45a23bb4 adds bellows, mumbles, and crackles as speech verbs 2022-09-17 00:59:27 -07:00
Putnam3145 e1cfa92080 fixes the worst use of a for loop ever 2022-09-13 23:19:12 -07:00
Changelogs b554906511 Automatic changelog compile [ci skip] 2022-09-14 00:58:24 +00:00
CitadelStationBot bc6c4ff39f Automatic changelog generation for PR #15838 [ci skip] 2022-09-13 14:41:41 -05:00
Timothy Teakettle 3de3dc8e6f lets ghosts click a pAI device to download into it without a master (#15838)
* yes

* Update pai.dm
2022-09-13 12:41:36 -07:00
zerothebigboy 0419ebaa55 cumb 2022-09-05 09:42:59 -04:00
zerothebigboy 4ad566c890 cumb 2022-09-05 09:18:44 -04:00
Changelogs 33ee9f5a19 Automatic changelog compile [ci skip] 2022-09-03 00:53:09 +00:00
CitadelStationBot 0359cf2fac Automatic changelog generation for PR #15839 [ci skip] 2022-09-02 17:24:16 -05:00
Lin 6e2eca339f Merge pull request #15839 from Putnam3145/destructive-analyzer-dupe-bug-fix
Destructive analyzer no longer buy one get 49 free
2022-09-02 22:24:13 +00:00
Putnam3145 617768dd40 Destructive analyzer no longer buy one get 49 free 2022-09-02 15:09:15 -07:00
Changelogs 34cfb4d6c2 Automatic changelog compile [ci skip] 2022-09-02 00:57:25 +00:00
CitadelStationBot 2b8ccad8da Automatic changelog generation for PR #15827 [ci skip] 2022-09-01 00:34:39 -05:00
Lin c35246d87b Merge pull request #15827 from Putnam3145/singunerf
Field generators now yell on the radio if they fail while there's a singulo/tesla
2022-09-01 05:34:36 +00:00