BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
shellspeed1
236e9e5e0c
ports launchpad targeting icon. ( #15844 )
2022-09-17 13:40:32 -07:00
BongaTheProto
0563def679
Merge remote-tracking branch 'upstream/master'
2022-08-03 17:41:43 -05:00
SandPoot
3be808e51e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-03 18:42:49 -03:00
silicons
7f04c665c9
Update parallax_holder.dm
2022-07-31 16:38:27 -07:00
BongaTheProto
03f4c65fc4
Merge remote-tracking branch 'upstream/master'
2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -03:00
keronshb
aa0d6d37a2
Fixes families
2022-06-09 20:55:40 -04:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
BongaTheProto
614f952cd5
Merge remote-tracking branch 'upstream/master'
2022-03-17 22:59:13 -05:00
SandPoot
04231b54f3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-17 22:46:31 -03:00
SandPoot
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
silicons
6f8fc5125d
Update space.dm
2022-03-15 10:24:46 -07:00
BongaTheProto
2ac1138ac1
Merge remote-tracking branch 'upstream/master'
2022-02-24 23:05:13 -05:00
SandPoot
7485eb43eb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-23 19:27:32 -03:00
silicons
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
BongaTheProto
d0563e1462
fix fix and reinstaurate
...
temporarily fixes the fucking 300000 space.dm runtimes and also readds the forced fem and masc stuff
2022-02-16 00:43:05 -05:00
BongaTheProto
ffcca5c46b
Merge remote-tracking branch 'upstream/master'
2022-02-08 01:16:02 -05:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -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
