 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
2d87780147
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-13 18:06:56 -03:00 |
|
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -03:00 |
|
|
Mosley
|
f700fd616b
|
Merge remote-tracking branch 'upstream/master'
|
2025-01-15 17:11:43 -05:00 |
|
|
SandPoot
|
e3a3ca5892
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-01-04 23:24:59 -03:00 |
|
|
SandPoot
|
66cc8cf50f
|
push
|
2025-01-01 20:20:16 -03:00 |
|
|
Mosley
|
106d5b3c1e
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-25 12:48:45 -05:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
BongaTheProto
|
65c2092959
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-12 18:40:08 -05:00 |
|
|
SandPoot
|
516ae4a3f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 17:21:56 -03:00 |
|
|
chelandGitHub
|
d08fe3afff
|
Update taperecorder.dm
|
2024-04-11 20:10:50 -03:00 |
|
|
chelandGitHub
|
d2884fd84f
|
Update multitool.dm
|
2024-04-11 20:09:09 -03:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
BongaTheProtoandGitHub
|
40eeadef98
|
Merge pull request #1131 from liz-lavenza/fix/runtimes-one
Fix a large number of runtimes
|
2024-04-06 18:43:43 -05:00 |
|
|
Elizabeth Lavenza
|
ccfc08b7a8
|
Fix attack_hand-related runtimes
|
2024-04-01 11:33:30 -04:00 |
|
|
ariaworld
|
0b3ae62833
|
Hopefully fix monkey and slime hard-dels
|
2024-04-01 01:11:03 +02: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 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
8d283066b6
|
just force them to update always, it's pretty much what tg does
|
2024-01-09 00:30:06 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
05e2cc0979
|
there
|
2024-01-05 00:18:21 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03: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 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03: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 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
Satile1
|
61ef0f337e
|
Hotel Radio channel! Mapping fixes and flavour
|
2023-05-25 17:09:21 +01:00 |
|
|
Darius
|
86b4f6c6ec
|
Merge branch 'master' into overhaul-quirk-dumb4cum
|
2023-02-19 20:23:16 -05:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
SandPoot
|
78c28a40c7
|
sneaky hint about reskinning
|
2023-02-09 02:54:31 -03:00 |
|
|
SandPoot
|
4491abc2d7
|
updates to most recent version and puts intent hints!
|
2023-02-09 02:20:02 -03:00 |
|
|
SandPoot
|
1b1154260c
|
correct everything and some intention based checks
|
2023-02-08 02:17:57 -03:00 |
|
|
Darius
|
f2cf15c590
|
Refactor Dumb For Cum quirk
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
|
2023-02-02 17:21:54 -05:00 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
BongaTheProto
|
86a005b590
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-11 12:51:40 -05:00 |
|