7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
bab984be30
i hate runtimestation i hate runtimestation
2022-10-31 11:50:54 -05:00
20ffbf1a12
backport
2022-10-26 14:02:11 -05:00
03c62f4359
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
...
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
24ee6077c7
push changes
2022-10-23 00:18:03 -03:00
f7937e54e0
Merge pull request #15860 from shellspeed1/public-bounties
...
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
e4d687da0c
Merge pull request #15857 from shellspeed1/premium-kas-for-borgs
...
Readds the premium ka for borgs
2022-10-08 15:39:19 -07:00
93e8a69c4c
Revert "Updates auxmos to 2.0.0"
2022-09-28 01:05:10 -07:00
142c07c51d
Merge branch 'master' into premium-kas-for-borgs
2022-09-23 17:00:02 -07:00
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
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
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
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
ef38bc5522
Merge pull request #15858 from Putnam3145/auxmos-2
...
Updates auxmos to 2.0.0
2022-09-23 16:20:31 -07:00
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
de4d468472
lets not have bounty cubes worth a bunch more than they should be. port of https://github.com/tgstation/tgstation/pull/56914 Credit to cacogen.
2022-09-20 20:55:38 -07:00
a55b2c4ff3
ports https://github.com/tgstation/tgstation/pull/56375 . Credit to cacogen.
2022-09-20 20:05:59 -07:00
44536ad7ab
Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen.
2022-09-20 16:57:49 -07:00
e3a3462b85
bounty bugfix
2022-09-20 13:37:14 -07:00
40dc7d57c3
port of https://github.com/tgstation/tgstation/pull/55762 , credit to ArcaneMusic.
2022-09-18 22:40:07 -07:00
aa7252ffd6
port of https://github.com/Skyrat-SS13/Skyrat-tg/commit/418c58a9c3c8b78c0577e150ad891aba8d7a7731 to make pad deconstructible.
2022-09-18 22:13:44 -07:00
cdb1fbb1e2
port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic.
2022-09-18 21:55:10 -07:00
b4f886d999
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
2022-09-18 20:55:22 -07:00
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
d95f5729cc
wow i forgot some extremely important updates haha
2022-09-18 16:27:48 -07:00
3dace329be
adds public bounty consoles without inflation, also removes the mint
2022-09-17 19:27:40 -07:00
2d90e0ab33
readds the premium ka but for borgs
2022-09-17 19:03:03 -07:00
236e9e5e0c
ports launchpad targeting icon. ( #15844 )
2022-09-17 13:40:32 -07:00
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
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
22d22447d2
removes the premium KA
2022-09-17 06:36:49 -07:00
d7a2f14298
fixes and ka
2022-09-17 03:46:24 -07:00
11ec2b89e0
borg pda
2022-09-17 02:40:37 -07:00
8d9804e953
adds radio access to borgs by default
2022-09-17 02:20:36 -07:00
59ef5bbcf1
port of the positronic alert console
2022-09-17 01:55:55 -07:00
096ca5c1e7
WOW I WROTE THIS WRONG GOOD IT WASN'T MERGED
2022-09-04 14:39:50 -07:00
11a28d2d3f
Makes from-ghost midrounds not roll if no ghosts
2022-08-31 15:05:37 -07:00
3700b9bbe5
Allows setting antags to "low"
2022-08-21 16:42:39 -07:00
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
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
d08a570c5f
Makes binary translator not show a wrong description
2022-08-18 21:51:39 -07:00
4df8538e16
oh my god i've been reading it wrong
2022-08-17 20:17:45 -07:00
65806b4e9f
please...
2022-08-17 00:00:52 -07:00
0c12f3f111
Removes persistence from glowing goo
2022-08-16 19:49:16 -06:00
39c8742a1d
yeah no brute forcing this screw you
2022-08-15 23:40:28 -07:00
69f2170cad
thank you unit tests i owe you my life
2022-08-14 23:21:27 -07:00
d5b380d7b3
iloathecitadelchanges
2022-08-13 18:22:30 -04:00
4e0498573f
thefartdomeengages
2022-08-13 18:16:37 -04:00
Lin