Commit Graph

2339 Commits

Author SHA1 Message Date
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
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 59ef5bbcf1 port of the positronic alert console 2022-09-17 01:55:55 -07: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 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
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
SandPoot f93ee9feea turrets 2022-07-31 05:06:01 -03: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
deathride58 1cea9bad5f oOOPS i applied the machinery volume nerf to the wrong thing 2022-06-14 00:27:50 -04:00
silicons 59a7ab04da Merge pull request #15677 from deathride58/vocalbark
Vocal barks - Fully customizable noises for talking!
2022-06-10 22:10:44 -07:00
silicons 63da07377b Merge pull request #15673 from deathride58/userfriendlycolormates
User-friendly colormates - adds HSV coloration to colormates! (and more)
2022-06-10 22:10:06 -07:00
silicons 9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes
Blockquotes for chat; Prettier examine text and more!
2022-06-10 22:09:12 -07:00
deathride58 2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
deathride58 ecb4ebafc5 oop - there was already a message for this! 2022-06-07 17:11:24 -04:00
deathride58 fa24f1bd3a user-friendly colormates - adds HSV coloration to colormates! 2022-06-07 16:36:10 -04:00
Putnam3145 6fe08f0a4e Rebalancing QCD a bit 2022-06-06 20:41:10 -07:00
deathride58 04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04:00
deathride58 5d648fcf6a makes jukeboxes deal hearing loss when too loud, makes being deaf temporarily mute jukebox 2022-05-21 19:23:10 -04:00
deathride58 a920bd4038 cleans up jukebox.js a little, improves UX for queueing 2022-05-21 13:29:03 -04:00
deathride58 113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
Lin dec7751f95 Merge pull request #15612 from SandPoot/status_displays
Syncs status displays to tg's version
2022-05-12 20:11:54 +00:00
SandPoot 90eab441aa Upload files 2022-05-09 18:50:17 -03:00
silicons ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07:00
SandPoot 5d4bae4482 Update files 2022-04-10 23:27:12 -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
Lin 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
silicons dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur 813ca511b5 Remaps sleepers to stasis beds and make stasis actually leave you 2022-04-06 15:58:27 +03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
Solaris-Shade 416c7412c8 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-04 16:58:17 -04:00
Lin 3d04fac657 Merge pull request #15576 from Putnam3145/fix-recycler-runtime
Fix recycler runtime
2022-04-02 07:17:31 +00:00
Lin 2a884f4e01 Merge pull request #15578 from SandPoot/fix-weird-diagonal
Fixes pathfinding not checking diagonal passability properly.
2022-04-02 07:17:02 +00:00
Solaris-Shade a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04:00
BlueWildrose 3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot 06528b61ae Update files 2022-03-30 22:32:58 -03:00
Putnam3145 06bda8946a wait, no, that's Lua-like, not even right 2022-03-30 14:55:15 -07:00
Putnam3145 a819424088 Fixes recycler runtime on emergency stop 2022-03-30 14:53:58 -07:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00