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
Solaris-Shade
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -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
SandPoot
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
silicons
fe427e7516
Merge pull request #15503 from Arturlang/Bodybuilding
...
Lets the limbgrower make mobs with only a chest
2022-02-26 18:08:12 -07:00
Artur
5d446f9133
Merge branch 'Bodybuilding' of https://github.com/Arturlang/Citadel-Station-13 into Bodybuilding
2022-02-21 01:09:30 +02:00
Artur
29a4e10592
Looping performance tweaks
2022-02-21 01:09:21 +02:00
Arturlang
2b11cfcc33
Linz's suggestion
...
Co-authored-by: Lin <linzolle@gmail.com >
2022-02-19 12:55:35 +02:00
Arturlang
86c711a003
Apply suggestions from code review
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-02-18 23:44:03 +02:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
Artur
50455227f1
More comments
2022-02-16 00:49:46 +02:00
Artur
f404390c91
Edge case and documentation
2022-02-16 00:46:25 +02:00
Artur
fc6f3cdffc
tested and done, seems to work
2022-02-11 16:54:05 +02:00
Artur
345c1616f2
Adds a way to build bodies using the limbgrower
2022-02-10 18:49:24 +02:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
SandPoot
760ed48476
Upload files
2022-02-02 00:45:32 -03:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
Lin
2379a2a342
Merge pull request #15370 from Putnam3145/genericized-plasma-trit
...
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
Putnam3145
c97d09c0ad
Fixes bluespace pipes (I think) ( #15437 )
2022-01-01 19:48:03 +01:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
Putnam3145
0ef0991d65
another tweak to it, for good measure
2021-11-26 22:49:30 -08:00
Putnam3145
2558789015
Adjusted bomb numbers
2021-11-26 20:18:47 -08:00
Lin
d5c17f0d84
Merge pull request #15376 from SandPoot/double
...
Double beds
2021-11-24 17:38:10 +00:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
4e407ffeb6
Merge pull request #15371 from DeltaFire15/unintended-devastation
...
Devastation level explosions no longer delete organs of gibbed humans
2021-11-17 16:19:23 +00:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
