BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
36f3edaf4c
push
2023-12-10 15:16:51 -03:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
BongaTheProto
ea324c5bc1
Merge remote-tracking branch 'upstream/master'
2023-07-28 20:43:43 -05:00
SandPoot
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
SandPoot
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
BongaTheProto
635fc04860
Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift
2023-05-19 17:32:38 -05:00
BongaTheProto
5116acad15
Merge remote-tracking branch 'upstream/master'
2023-05-06 18:31:55 -05:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
BongaTheProto
4b547a3208
Merge remote-tracking branch 'upstream/master'
2023-04-08 15:49:43 -05:00
SandPoot
7cc1ecfa1e
(i'm being shot by those red arrows help)
2023-04-06 18:49:21 -03:00
Darius
556840700f
Better old-shift compatability
...
This commit:
- Moves the pixel shifting defines to mob defines
- Updates pixel shifting define names to be more unique
- Updates old pixel shifting to use shift limits
2023-02-24 20:10:55 -05:00
Darius
71e83499fc
Allow classic pixel shifting
...
Uncomments the removed lines for pixel shifting verbs, allowing them to be used again.
2023-02-24 19:49:32 -05:00
BongaTheProto
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
SandPoot
11a06b1686
pixelshift + layering
2023-02-21 14:27:10 -03:00
SandPoot
992d25ea08
Revert "pixelshift + layering"
...
This reverts commit 51818478c5
2023-02-21 14:25:29 -03:00
SandPoot
51818478c5
pixelshift + layering
2023-02-21 14:20:48 -03:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
PeriodicChaos and Jerry Wester
b538ad721b
modsuits part 2
2022-12-11 20:30:58 -07:00
BongaTheProto
e1cb9c8346
Merge remote-tracking branch 'upstream/master'
2022-09-27 23:19:10 -05:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
shellspeed1
f2ed6a571c
this gets it to the point it compiles
2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829
initial port
2022-09-09 00:29:20 -07:00
Zirok
9c5aa2be68
Actually fix compilation
2022-09-02 18:24:34 +02:00
Zirok
eeacea573c
fix invisibility checks in visible_message()
...
This is how it's done in the /tg/ PR, unfortunately I have no idea if this is actually correct!
2022-09-02 18:24:34 +02:00
silicons and GitHub
9a17ef3bf2
Merge pull request #15663 from deathride58/blockquotes
...
Blockquotes for chat; Prettier examine text and more!
2022-06-10 22:09:12 -07:00
BongaTheProto
6d385f2b2e
Merge remote-tracking branch 'upstream/master'
2022-06-07 19:10:13 -05:00
SandPoot
be1357bdb0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-07 17:29:38 -03:00
deathride58
04a0a3b869
chat blockquotes; prettier examine text and more!
2022-06-03 18:55:18 -04:00
deathride58
ce3fac30d6
Fully restores the functionality of audiovisual redirection
2022-06-03 14:31:12 -04:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03: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
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
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
BongaTheProto
7dc36994a9
Merge remote-tracking branch 'upstream/master'
2022-03-14 13:31:20 -05:00
SandPoot and GitHub
e466f47992
Replaces infoboxes with examine blocks ( #235 )
2022-03-14 14:22:18 -03:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
BongaTheProto and GitHub
4876b05297
Merge pull request #177 from SPLURT-Station/ambitions
...
Ambitions from skyrat
2022-02-08 16:21:00 -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 and GitHub
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
BongaTheProto
5638985734
Merge branch 'ambitions' into pr/176
2022-02-06 20:27:38 -05:00
BongaTheProto