75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
dc08550162
push
2024-08-25 04:38:03 -03:00
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
984d7ffe9a
holiday and quirk support
2024-04-10 22:51:25 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -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
65ed5c79f4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-30 02:07:21 -03:00
c519c1e128
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-21 15:00:51 -03:00
8d6801c387
holiday patterns + pansexual/panromantic holiday
2023-11-16 16:34:10 -07:00
54089a159c
SpookyStation fixes and edits ( #16019 )
...
* spooky 2023
* Spooky colormates, better telecomms?
* yes
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* yes
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* minor pre-merge change
I don't feel like requesting changes for this small of a nitpick so I'll just do it myself & merge.
---------
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2023-11-13 10:02:31 +01:00
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
54641ce201
send
2023-01-23 20:44:28 -03:00
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
b4330b2f3d
GOODBYE SPECIES, HELLO COMPONENT
2022-08-05 18:19:22 +01:00
8e71dbe371
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-07-24 15:07:34 -03:00
329e160a1f
/BiologicalLife(delta_time...
2022-07-20 21:40:53 -03:00
25deceb75f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-19 23:02:20 -03:00
669ce698e0
Update dynamic.dm
2022-06-15 21:02:32 -04:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
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
9df4ed8253
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:48:16 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
7a2cc5ddfa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-10 22:03:11 -03:00
062da9bb05
fixed dynamic days (lowertext)
2022-03-06 13:18:59 -08:00
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
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
3b1304f432
Weekly dynamic days
2022-02-02 17:38:19 -08:00
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
0031ee81db
Updates runechat adding languages to it ( #219 )
2022-01-12 17:13:48 -03:00
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
f0ff064dc1
missed a line
2021-12-08 05:12:32 +01:00
04797a961b
linters b gone
2021-12-08 05:07:22 +01:00
146ada0d3d
Removes anchored from jacq
2021-11-20 23:54:16 -05:00
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05:00
efa02148d1
Merge pull request #15275 from keronshb/halloweenball2021
...
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04:00
186b552103
merge
2021-10-29 21:50:58 -07:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
319c5e23fe
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
...
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
5054ea87ce
Merge pull request #15310 from keronshb/jaqincinerator
...
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
b2a890269a
Fixes destroy
2021-10-28 15:44:08 -04:00
29a39ed9ea
Indestructable change
2021-10-28 15:30:00 -04:00
SandPoot