Commit Graph
981 Commits
Author SHA1 Message Date
SandPoot 9e8a510ed5 chapter 2: allow right click on action buttons 2023-08-26 21:37:06 -03:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
zeroisthebiggayandGitHub 4d72fd3ddf Update explorer_gear.dm 2023-02-20 22:53:26 -05:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPootandGitHub 2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280)
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
2023-01-09 18:55:07 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
SandPoot 42d4abc164 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:44:44 -03:00
SandPootandGitHub 535c1c623e Merge pull request #15896 from LeDrascol/fix-machine-init-process
Fix init_process not preventing processing
2023-01-07 15:44:58 -03:00
SandPoot d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
Darius b8079b108f Move furnace init variable
Moves the init_process variable above the var defines to drastically improve style.

Requested by SandPoot.
2022-12-26 22:35:22 -05:00
HatterhatandGitHub 50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Darius dae235f97c Selective mineral machine init_process
Requested by SandPoot. Disables init_process for mineral (mining) machines, and enables it on a case-by-case basis.

Downstream mineral machines must be updated with this change.
2022-12-23 16:16:57 -05:00
Darius bcae0e66ff Fix init_process not preventing processing
Prevents machines from running faster when set to both not init_process and not speed_process.

Changes mineral machine to init_process to fix potential issues caused by this.
2022-12-16 16:25:45 -05:00
SandPoot ba6d614e6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-11-09 20:50:44 -03:00
Hatterhat bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
siliconsandGitHub 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
siliconsandGitHub d91100c0f2 Merge pull request #15867 from Hatterhat/fists
[READY FOR REVIEW] [FRAMEWORK] kinetic brawling - the kinetic gauntlets rework nobody asked for
2022-10-08 19:57:37 -07:00
Hatterhat 282cc819dc works on my machine 2022-10-04 20:10:09 -05:00
Hatterhat 38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1andGitHub 142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
siliconsandGitHub 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
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
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
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
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
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
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
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03: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