Commit Graph

705 Commits

Author SHA1 Message Date
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03: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
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
Putnam3145
7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal
Removes minesweeper
2021-10-27 05:11:48 -07:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
f5e52f810d I HATE YOU 2021-10-03 13:54:58 -07:00
silicons
715251dea1 wack 2021-10-03 13:25:30 -07:00
silicons
31467420d7 Merge pull request #15221 from SandPoot/colormate
Colormate tgui + minor tgui updates
2021-10-03 08:51:51 -07:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
Putnam3145
a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
Putnam3145
79f9560135 maybe fixes minesweeper lag without weirdness 2021-08-17 20:47:13 -07:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
LetterN
57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui
TGUIZES the cloning computer
2021-04-17 17:00:49 -06:00
SandPoot
a745431155 better this 2021-04-13 17:26:46 -03:00
SandPoot
330a3b8c9a upload files 2021-04-13 17:25:08 -03:00
Blue Wildrose
8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
DeltaFire
1e7d4e4335 *snap 2021-03-25 16:53:25 +01:00
LetterN
cdf589d828 proper fix aoaooa 2021-03-24 13:26:43 +08:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N
59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
Putnam
cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Putnam
2137818d76 Massively reduced max-size minesweeper 2021-03-03 18:42:35 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
DeltaFire
60708b03df check 2021-02-24 05:16:15 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00