Commit Graph
1024 Commits
Author SHA1 Message Date
shellspeed1 2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03: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
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
BongaTheProto 917eeb756a Merge remote-tracking branch 'upstream/master' 2022-09-03 16:42:38 -05:00
SandPoot 2d9b6d8fc5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-03 17:02:15 -03:00
zeroisthebiggayandGitHub 7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829)
* basedado

* becnhpress
2022-08-31 21:38:44 -07:00
BongaTheProto 9fe4b25bc9 Merge remote-tracking branch 'upstream/master' 2022-08-27 22:28:10 -05:00
SandPoot ae3c521bdd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-27 15:58:30 -03:00
siliconsandGitHub 4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1 2e6ff742a9 minor change to map template description. 2022-08-24 15:15:36 -07:00
shellspeed1 d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1 f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
siliconsandGitHub bfd3aadab1 Merge pull request #15773 from zeroisthebiggay/mining
mining drills scanners and crushers getting a TG inspired glow up
2022-08-20 12:27:20 -07:00
siliconsandGitHub d438103cf9 Merge pull request #15761 from Hatterhat/fatrolling
bloodborne (adds dodgeroll combat RMB to the cleaving saw, confers melee/projectile iframes)
2022-08-20 12:27:04 -07:00
zerothebigboy 4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
zerothebigboy f39de3b781 yeah 2022-08-09 13:26:13 -04:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 6108e1d522 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 19:46:26 -03:00
Hatterhat c91d12ef93 qstep 2022-08-06 21:42:55 -05:00
Hatterhat fdd03402ed dark souls 2022-08-06 16:25:28 -05:00
Hatterhat 44b23b873d crusher rename + 350 chr limit descs 2022-08-05 17:41:41 -05:00
Turtle567 4f9a50b2c7 Buff Hiero Club, Chipped King Goat
Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously.

Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"
2022-07-25 16:47:28 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
BongaTheProto 10eb587407 Merge remote-tracking branch 'upstream/master' 2022-04-08 13:46:43 -05:00
SandPoot 31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
BongaTheProto d1eafd39a4 Merge remote-tracking branch 'upstream/master' 2022-02-20 19:41:46 -05:00
SandPoot f3ba281d78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-20 21:18:57 -03:00
LinandGitHub 1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
BongaTheProto b437b03b48 Merge remote-tracking branch 'upstream/master' 2022-02-13 13:40:33 -05:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00