 ariaworld
|
fcfbd4008c
|
bring back the d20 of fate with wiznerd removed
|
2024-09-18 00:48:20 +02:00 |
|
|
ariaworld
|
d42c7a4f2a
|
Merge remote-tracking branch
|
2024-08-29 14:42:55 +02:00 |
|
|
ariaworld
|
d2422de379
|
Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.
|
2024-08-05 20:46:52 +02: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
|
7f953a03af
|
listener update
|
2024-05-22 00:06:08 -03:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
11abf28926
|
i am serious DO NOT contact me if you spawn as your species on the skeleton ruin, cry about it
|
2024-04-13 15:52:22 -03:00 |
|
|
SandPoot
|
c2df4281b9
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-05 23:31:50 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
Elizabeth Lavenza
|
78fff6d292
|
Fix a number of trait-related harddels
|
2024-03-29 17:22:50 -04: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
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -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 |
|
|
SandPootandGitHub
|
419f3b5ac8
|
Merge pull request #367 from DetectiveEnotsky/patch-1
Allows you to pick your character for certain ghost roles
|
2024-01-19 22:01:03 -03:00 |
|
|
SandPoot
|
06af18b7db
|
push
|
2024-01-19 20:18:26 -03:00 |
|
|
MysteryMan21333
|
6766568eaa
|
V1.0
|
2024-01-16 19:37:21 -06: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
|
2cefedd316
|
push
|
2024-01-16 16:54:53 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
57a7a516e6
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-06 22:43:10 -05:00 |
|
|
SandPoot
|
d63c2ebdd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-05 12:35:35 -03:00 |
|
|
SandPoot
|
62806d0580
|
doesn't have all slots
|
2023-02-11 14:16:41 -03:00 |
|
|
SandPoot
|
b62b5c3e12
|
fix more alt titles
|
2023-02-11 14:02:22 -03:00 |
|
|
zerothebigboy
|
091d9ec00f
|
good
|
2023-01-30 00:01:22 -05:00 |
|
|
BongaTheProto
|
3341812b44
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-20 17:16:19 -05:00 |
|
|
SandPoot
|
550db1b6ee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-20 17:27:19 -03:00 |
|
|
Letter NandGitHub
|
a1e87e3895
|
this does not exist YET
|
2022-08-08 10:05:19 +08:00 |
|
|
Letter NandGitHub
|
781bc9c2de
|
surely this bug is fixed right?
|
2022-08-08 10:01:24 +08:00 |
|
|
BongaTheProto
|
811c1df810
|
Merge remote-tracking branch 'upstream/master'
|
2022-07-24 12:05:49 -05:00 |
|
|
SandPoot
|
0a0e4de14b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-07-24 02:59:28 -03:00 |
|
|
deathride58
|
578eb440c1
|
If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix
|
2022-07-20 16:51:38 -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
|
2555843026
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
|
2022-04-09 03:06:56 -03:00 |
|
|
SandPoot
|
9df4ed8253
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:48:16 -03:00 |
|
|
SandPoot
|
ada0ea7f32
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:40:23 -03:00 |
|
|
LinandGitHub
|
fd286c325e
|
Merge branch 'master' into Projectile_Rework
|
2022-04-09 04:19:56 +00: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
|
189716314f
|
Would you like some defines in these trying times?
|
2022-03-23 12:10:02 -03:00 |
|
|
Solaris-ShadeandGitHub
|
0395ba47d7
|
Merge branch 'master' into Projectile_Rework
|
2022-03-11 23:07:31 -05: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
|
54aec9bd98
|
Merge remote-tracking branch 'upstream/master'
|
2022-02-27 14:38:06 -05:00 |
|