b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
236e9e5e0c
ports launchpad targeting icon. ( #15844 )
2022-09-17 13:40:32 -07:00
3be808e51e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-03 18:42:49 -03:00
7f04c665c9
Update parallax_holder.dm
2022-07-31 16:38:27 -07:00
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -03:00
aa0d6d37a2
Fixes families
2022-06-09 20:55:40 -04:00
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
04231b54f3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-17 22:46:31 -03:00
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
6f8fc5125d
Update space.dm
2022-03-15 10:24:46 -07:00
7485eb43eb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-23 19:27:32 -03:00
de3ea65587
fixes parallax whitifier applying when parallax is disabled ( #15516 )
...
* :)
* 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
* a
* woops
2022-02-21 17:20:41 -07:00
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
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