Mosley
dedc5aef94
Merge remote-tracking branch 'upstream/master'
2024-12-05 16:49:03 -05:00
SandPoot
51b854d788
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-12-04 19:21:37 -03:00
ariaworld
4ea62745cf
Fixes ckey transfers making keys lowercase
2024-11-21 20:09:44 +01:00
BongaTheProto
353e81e8ce
Merge remote-tracking branch 'upstream/master'
2024-05-29 17:56:50 -05:00
SandPoot
95a30412ad
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-05-25 15:46:29 -03:00
SandPoot
ad0f659226
push
2024-05-23 21:53:15 -03:00
SandPoot
7ec9e65dcf
cease those screams
2024-04-05 18:39:33 -03:00
BongaTheProto
9faeb05972
fixes wrong verb references
...
Regex is a double edged sword.
Also fixes a bug I hadn't noticed in mentor verbs
2024-03-31 22:00:37 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
SandPoot
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
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
ariaworld
93f0fb7e6c
Fix a few hard-dels
2024-01-21 16:14:07 +01:00
SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
BongaTheProto
750f742f95
Merge remote-tracking branch 'upstream/master'
2023-12-28 18:31:39 -05:00
SandPoot
e7b267ca63
push
2023-12-27 01:06:25 -03: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
SandPoot
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
BongaTheProto
dca4dab806
Merge remote-tracking branch 'upstream/master'
2023-10-10 21:58:50 -05:00
SandPoot
a70314d98e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-10 17:29:05 -03:00
SandPoot
b624de1c10
you go
2023-10-08 13:01:15 -03:00
BongaTheProto
cdd5bb87d8
Merge remote-tracking branch 'upstream/master'
2023-08-08 01:42:46 -05:00
SandPoot
4b9488a9b3
right codebase!
2023-08-05 14:05:00 -03:00
SandPoot
8bf6e9ffcc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-08-05 13:51:50 -03:00
SandPoot
c54ce2d09d
wrong codebase
2023-08-04 00:16:53 -03:00
SandPoot
403c49afab
push
2023-08-04 00:11:08 -03:00
KeplerWasTaken
02c20c35e4
Mafia verb removal
2023-03-28 23:22:55 +02:00
SandPoot
32535e69b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-23 18:31:23 -03:00
silicons
f2b8061d4b
Update observer.dm ( #15802 )
2022-08-21 20:39:17 -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
dac4e9b974
fixes ghost pixel z not resetting on orbit stop
2022-06-05 18:01:15 -04:00
deathride58
1a918ed8db
animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game
2022-05-31 19:22:30 -04:00
BongaTheProto
479b497b00
ok
2022-04-19 01:30:44 -05:00
nullfag
65f87e3e05
"clients dissapear at literally any moment"
2022-04-17 01:30:19 +02:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
9df4ed8253
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:48:16 -03: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
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
E
0592520bea
fixes runtimes
2021-12-06 20:36:46 +01:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03: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