Commit Graph

10227 Commits

Author SHA1 Message Date
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
2022-09-23 16:26:54 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return
Fixes the mining borg point card
2022-09-23 16:24:36 -07:00
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
2022-09-23 16:21:19 -07:00
silicons
c2f1e24223 Merge pull request #15832 from Putnam3145/from-ghost-check
Makes from-ghost midrounds not roll if no ghosts
2022-09-23 16:21:08 -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
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
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
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
shellspeed1
59ef5bbcf1 port of the positronic alert console 2022-09-17 01:55:55 -07:00
Putnam3145
096ca5c1e7 WOW I WROTE THIS WRONG GOOD IT WASN'T MERGED 2022-09-04 14:39:50 -07:00
Putnam3145
11a28d2d3f Makes from-ghost midrounds not roll if no ghosts 2022-08-31 15:05:37 -07:00
Putnam3145
3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07:00
silicons
4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay
the great medbay resprite PR: ported from a freshly merged TG PR
2022-08-20 12:24:46 -07:00
silicons
ff501bc0be Merge pull request #15782 from Putnam3145/fix-bad-air-things
Make sure ChangeTurf updates air ref on all paths
2022-08-20 12:24:32 -07:00
Putnam3145
d08a570c5f Makes binary translator not show a wrong description 2022-08-18 21:51:39 -07:00
Putnam3145
4df8538e16 oh my god i've been reading it wrong 2022-08-17 20:17:45 -07:00
Putnam3145
65806b4e9f please... 2022-08-17 00:00:52 -07:00
Cognition
0c12f3f111 Removes persistence from glowing goo 2022-08-16 19:49:16 -06:00
Putnam3145
39c8742a1d yeah no brute forcing this screw you 2022-08-15 23:40:28 -07:00
Putnam3145
69f2170cad thank you unit tests i owe you my life 2022-08-14 23:21:27 -07:00
zerothebigboy
d5b380d7b3 iloathecitadelchanges 2022-08-13 18:22:30 -04:00
zerothebigboy
4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
Putnam3145
1e5d19a5b1 make sure ChangeTurf updates air ref on all paths 2022-08-12 21:37:05 -07:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04: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
Putnam3145
e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
silicons
802afe1df5 Merge pull request #15747 from Linzolle/catwalk
fix catwalk overlays not working properly
2022-08-06 23:17:03 -07:00
silicons
cb87b004f1 Update airlock.dm 2022-08-02 23:13:36 -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
Linzolle
cd1389ae0f fix catwalks 2022-08-02 22:59:59 -07:00
Lin
3cb77a2b23 Merge pull request #15737 from SandPoot/bitfields
Refactor bitfields global, improve turret_flags debugging
2022-08-02 00:24:58 +00:00
Timothy Teakettle
e467a0d289 offset 2 pixels down so it looks better 2022-08-01 13:23:31 +01:00
Timothy Teakettle
e87146bf4e debug messages, bug fix 2022-08-01 13:17:06 +01:00
Timothy Teakettle
0e20cff184 vtuber mode 2022-08-01 12:58:41 +01:00
silicons
76cac539b5 Update defib.dm 2022-07-31 16:42:38 -07:00
SandPoot
f93ee9feea turrets 2022-07-31 05:06:01 -03:00
silicons
eb7b3f706f Update closets.dm 2022-07-28 16:17:46 -07:00
Lin
ede10af2fe Merge pull request #15720 from BlueWildrose/autolatheshocks
Shocked autolathe will no longer infinitely zap you with the menu open
2022-07-24 05:39:59 +00:00
Cognition
d9a3510512 Shocked autolathe will no longer infinitely zap you with menu open 2022-07-22 23:05:14 -06:00
Cognition
e8cdf35d57 Using wirecutters on an autolathe will now have appropriate behavior 2022-07-22 18:26:03 -06:00
silicons
dbfae860e1 Merge pull request #15702 from SandPoot/twinkle-welding-tool
Ports Tau Ceti's welding animation!
2022-07-08 14:21:33 -07:00
silicons
f7c7464043 Merge pull request #15684 from deathride58/barkfollowup
Bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, and more!
2022-07-08 14:21:14 -07:00