 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
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
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
deathride58andGitHub
|
e729badcd2
|
Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
|
2023-12-12 19:21:17 -05:00 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
BongaTheProtoandGitHub
|
6872017f1d
|
Merge pull request #1009 from ariaworld/spooktober-update
[SEMI-MODULAR] Small Spooktober update (In November)
|
2023-12-08 20:28:44 -05:00 |
|
|
BongaTheProto
|
700fd57efb
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-08 20:22:05 -05:00 |
|
|
SandPoot
|
42fdd30ba4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-05 17:47:58 -03:00 |
|
|
ariaworld
|
2288ab9df1
|
Merge remote-tracking branch 'upstream/master' into spooktober-update
|
2023-11-25 01:16:38 +01:00 |
|
|
BongaTheProto
|
e3d1286cb8
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-23 17:23:16 -05:00 |
|
|
SandPoot
|
b290efc434
|
push
|
2023-11-22 14:11:17 -03:00 |
|
|
SandPoot
|
c519c1e128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-21 15:00:51 -03:00 |
|
|
ariaworld
|
7bc56f700b
|
Add: New lines for linters.
|
2023-11-18 18:29:50 +01:00 |
|
|
ariaworld
|
1f463a734c
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-11-17 23:26:33 +01:00 |
|
|
BongaTheProtoandGitHub
|
de5e1e7611
|
Merge pull request #981 from ariaworld/lewd-smallupdate
[Lewd] [Semi-Modular] - Human Erect Penis and Balls Sprites-Fix & More!
|
2023-11-06 15:06:15 -05:00 |
|
|
BongaTheProtoandGitHub
|
b312b97970
|
Merge pull request #982 from ariaworld/fix-photography
[FIX] - Photography Album Persistence + Neutral Photographer Quirk
|
2023-11-03 17:26:38 -05:00 |
|
|
SandPoot
|
1dc38c46d6
|
poosh
|
2023-11-02 23:17:49 -03:00 |
|
|
ariaworld
|
1594bd360e
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-10-31 14:03:41 +01:00 |
|
|
ariaworld
|
23f141965e
|
First draft.
|
2023-10-31 14:03:34 +01:00 |
|
|
ariaworld
|
708ad3d128
|
Revert "modularize"
Demodularizes Photography Album Persistence.
This reverts commit 7ebdfba5c9.
|
2023-10-24 21:59:22 +02:00 |
|
|
ariaworld
|
cf406724d6
|
Climax positive mood lasts more, less sex verb cooldown.
|
2023-10-23 22:28:01 +02:00 |
|
|
BongaTheProto
|
604b8ea867
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-20 22:29:47 -05:00 |
|
|
SandPoot
|
3aa3aead3d
|
re-do the whole goddamn thing.
|
2023-10-20 17:48:13 -03:00 |
|
|
BongaTheProto
|
6e6bce8772
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-18 22:02:48 -05:00 |
|
|
SandPoot
|
45a94856c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-18 18:24:11 -03:00 |
|
|
SandPoot
|
297ee64977
|
push
|
2023-10-12 15:45:35 -03:00 |
|
|
BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
|
BlueWildroseandGitHub
|
aff43910af
|
Merge pull request #16007 from SandPoot/throwing-updat
[DNM] Updates firemanning, throwing stuff
|
2023-10-11 13:51:54 -06:00 |
|
|
BongaTheProto
|
7b5ecc7b49
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-07 23:28:42 -05:00 |
|
|
SandPoot
|
910263d2d9
|
Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13
|
2023-10-05 22:01:18 -03:00 |
|
|
SandPoot
|
6cd2cfcd01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config
|
2023-10-05 21:25:29 -03:00 |
|
|
SandPootandМарк
|
a105852042
|
the stuff
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
|
2023-10-05 21:15:11 -03:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPootandGitHub
|
c3735c05ac
|
Merge branch 'master' into throwing-updat
|
2023-10-04 15:15:15 -03:00 |
|
|
SandPoot
|
5a90dabd3c
|
stuff
|
2023-10-03 23:22:57 -03:00 |
|
|
SandPoot
|
bb1886ddb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-03 21:00:13 -03:00 |
|
|
SandPoot
|
8c0a4131ac
|
why did i check for empty hand again?
|
2023-10-03 14:29:17 -03:00 |
|
|
BongaTheProtoandGitHub
|
a59e9f45da
|
Merge pull request #870 from Zattarra/STOMPSHIELDING
Adds stepping interaction preference toggle.
|
2023-09-23 17:39:22 -05:00 |
|
|
BongaTheProtoandGitHub
|
630fd4627b
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-09-16 15:48:22 -05:00 |
|
|
SandPoot
|
68410e5163
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-16 17:38:21 -03:00 |
|
|
BongaTheProto
|
cf3f27f3a0
|
Merge branch 'master' into pr/870
|
2023-09-16 15:25:40 -05:00 |
|
|
BongaTheProto
|
f8b2fdc38b
|
Update flavor_text.dm
|
2023-09-16 15:25:35 -05:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
LinandGitHub
|
c45ef33afa
|
Merge pull request #16000 from SandPoot/priority_announce
Randomizing station names trait no longer hides announcements
|
2023-09-16 13:03:44 -04:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
siliconsandGitHub
|
98c0f38de3
|
Merge pull request #15999 from SandPoot/do_after
Implements timed_action_flags for do_after-like procs
|
2023-09-14 17:59:55 -07:00 |
|
|
SandPoot
|
486e429597
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 19:25:27 -03:00 |
|
|
SandPoot
|
a82a99c5e7
|
never meant to be hidden
|
2023-09-14 18:01:28 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
SandPoot
|
07219e311a
|
final tg sync
|
2023-09-08 21:17:01 -03:00 |
|