 Elizabeth Lavenza
|
dfc903757a
|
Fix unavailable button tint not clearing on stat change
|
2024-04-13 20:03:55 -04:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
deathride58andGitHub
|
dd8c641520
|
Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
|
2024-04-12 23:31:54 -04:00 |
|
|
SandPoot
|
002a4c31c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 22:06:15 -03:00 |
|
|
SandPoot
|
91045350e5
|
overlay stuff
|
2024-04-12 22:01:03 -03:00 |
|
|
SandPoot
|
984d7ffe9a
|
holiday and quirk support
|
2024-04-10 22:51:25 -03:00 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
BongaTheProtoandGitHub
|
78d4eaeaaa
|
Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
Fix harddel issues with 515 upgrade PR
|
2024-04-07 03:16:55 -05:00 |
|
|
Elizabeth Lavenza
|
3619b3d634
|
Fix global procs called without GLOBAL_PROC and vice versa
|
2024-04-07 00:02:34 -04:00 |
|
|
Elizabeth Lavenza
|
c94743d59c
|
Fix invalid proc references in core code RegisterSignal calls
|
2024-04-06 22:07:53 -04:00 |
|
|
BongaTheProto
|
2709ec887c
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-06 19:06:12 -05: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 |
|
|
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
|
7ec9e65dcf
|
cease those screams
|
2024-04-05 18:39:33 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
ariaworld
|
fecf8d1b02
|
Fix sleep dealing damage
|
2024-04-03 00:38:28 +02:00 |
|
|
Elizabeth Lavenza
|
04b6652937
|
Fix incorrect procref for _paci_check
|
2024-04-02 17:22:45 -04:00 |
|
|
Elizabeth Lavenza
|
d72fb0fe5e
|
Fix runtime in overflow bureaucracy station trait
|
2024-04-01 13:26:32 -04:00 |
|
|
Elizabeth Lavenza
|
382cb28b15
|
Fix a number of reported runtimes
|
2024-04-01 11:33:31 -04:00 |
|
|
Elizabeth Lavenza
|
f0ff970b79
|
Fix runtime from mobs escaping off other mobs' heads
|
2024-04-01 11:33:30 -04:00 |
|
|
BongaTheProto
|
de781b94e8
|
Update action.dm
|
2024-03-31 22:11:50 -05:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
BongaTheProtoandGitHub
|
0a564a92e7
|
Merge pull request #1127 from liz-lavenza/fix/harddels-one
[TESTMERGE] Fix a number of harddels
|
2024-03-31 21:15:28 -05:00 |
|
|
BongaTheProto
|
6df04b8167
|
Merge remote-tracking branch 'upstream/master' into 515-auxmos
|
2024-03-30 17:40:23 -05:00 |
|
|
SandPoot
|
80666ec1dd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-30 16:47:39 -03:00 |
|
|
Elizabeth Lavenza
|
eba4c5e0b2
|
Fix action deletion runtimes
|
2024-03-29 17:22:50 -04:00 |
|
|
BongaTheProto
|
ed4ab9e8ab
|
Merge branch 'auxmos-515' of https://github.com/jupyterkat/Citadel-Station-13 into upstream-merge
|
2024-03-28 18:27:30 -05:00 |
|
|
Elizabeth Lavenza
|
44a5f1fdd0
|
Fix runtime in photosynthesis element Detach()
|
2024-03-28 18:54:35 -04:00 |
|
|
Elizabeth Lavenza
|
90378d4da9
|
Fix direct Destroy calls
|
2024-03-28 18:18:31 -04:00 |
|
|
Elizabeth Lavenza
|
a8599d6833
|
Fix dash harddel
|
2024-03-28 18:14:49 -04:00 |
|
|
Elizabeth Lavenza
|
a2f90292b4
|
Fix harddels with hardened spikes
|
2024-03-28 18:14:49 -04:00 |
|
|
Elizabeth Lavenza
|
0363324110
|
Fix mobs harddeling due to species actions
|
2024-03-28 18:14:49 -04:00 |
|
|
BongaTheProto
|
493fa7f215
|
Merge branch 'master' into upstream-merge
|
2024-03-28 15:43:55 -05:00 |
|
|
BongaTheProto
|
d20caf7191
|
Merge branch '515-update' into upstream-merge
|
2024-03-24 17:39:24 -05:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
BongaTheProto
|
8bbb0fda41
|
Merge branch 'master' into upstream-merge
|
2024-03-24 16:41:07 -05:00 |
|
|
ariaworldandGitHub
|
a80e194143
|
Nevermind, this is easier to read
|
2024-03-19 11:16:17 +01:00 |
|
|
ariaworldandGitHub
|
96b2f9f7d4
|
Update severe.dm
|
2024-03-19 11:14:44 +01:00 |
|
|
ariaworld
|
5fef62f23e
|
Fix monophobia triggering when grabbed by a macro character
|
2024-03-16 14:54:17 +01: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
|
cd8ff7e5bd
|
thank you tg
|
2024-03-13 14:48:21 -03:00 |
|
|
SandPoot
|
8516b07eee
|
please do not end your paths with /
|
2024-03-13 14:43:40 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
BongaTheProto
|
1883c47d5c
|
basic ref regex
makes the proc calls compatible with 515
|
2024-03-11 19:46:05 -05:00 |
|
|
BongaTheProtoandGitHub
|
33bed9574d
|
Merge pull request #1091 from ariaworld/throwkiss-emote
[NON-MODULAR PORT] Adds blowable kisses + improved code for updating lip color and applying special lipstick traits
|
2024-03-11 17:46:46 -05: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
|
558d33f7c6
|
Merge branch 'master' into upstream-merge
|
2024-03-04 16:59:05 -05:00 |
|
|
BongaTheProtoandGitHub
|
b07d12e225
|
Merge pull request #1093 from xhianil/E621-images
E621 images
|
2024-03-01 21:27:31 -05:00 |
|