 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
f0fb1ad3d7
|
no more pausing metabolization, go build a stasis bed you lazy.
|
2025-04-18 17:37:43 -03:00 |
|
|
Cecily-C-Catherine
|
d6983c052c
|
Dullahanborg
Adds the dullahanborg sprites
|
2024-12-03 13:45:53 -06:00 |
|
|
Mosley
|
3c63bdc873
|
Merge remote-tracking branch 'upstream/master'
|
2024-11-29 19:41:18 -05:00 |
|
|
SandPootandGitHub
|
2a306556be
|
Merge pull request #388 from xTheLifex/tweaks
Tweaks
|
2024-11-28 20:09:05 -03:00 |
|
|
Mosley
|
a44046076a
|
Merge remote-tracking branch 'upstream/master'
|
2024-11-21 22:44:41 -05:00 |
|
|
Arrhythmia_V
|
c2d2a38b2b
|
Add code for Blade tail
|
2024-11-02 00:50:32 -04:00 |
|
|
Mosley
|
0c443a76f3
|
Merge branch 'content-stuff'
|
2024-09-21 15:18:11 -05:00 |
|
|
SandPoot
|
a103acd509
|
cavalry's here
|
2024-09-10 02:00:55 -03:00 |
|
|
xTheLifex
|
516d5785ce
|
AI shell at roundstart
|
2024-09-09 22:11:01 -03:00 |
|
|
ariaworld
|
2c17a32098
|
Add damage description to simple mobs, nerf imps a bit
|
2024-09-07 21:28:16 +02:00 |
|
|
xTheLifex
|
33d3393f75
|
SSD no longer hungry
|
2024-09-06 12:16:17 -03:00 |
|
|
ariaworld
|
d42c7a4f2a
|
Merge remote-tracking branch
|
2024-08-29 14:42:55 +02:00 |
|
|
SandPoot
|
2a9182dfdf
|
push
|
2024-08-09 20:13:26 -03:00 |
|
|
xTheLifex
|
7fcbcde764
|
emote
|
2024-08-09 18:17:13 -03:00 |
|
|
BongaTheProto
|
ade01dfd7d
|
Merge remote-tracking branch 'upstream/master'
|
2024-07-05 21:33:15 -05:00 |
|
|
SandPoot
|
faa6be903d
|
fix now!
|
2024-07-04 21:54:25 -03:00 |
|
|
Anonymous
|
c65847c8fb
|
codes new sprites in
why trhe heck k4t getting me acting unwise
|
2024-07-02 13:01:36 +03:00 |
|
|
BongaTheProto
|
353e81e8ce
|
Merge remote-tracking branch 'upstream/master'
|
2024-05-29 17:56:50 -05:00 |
|
|
SandPoot
|
897f4e2914
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-22 21:08:11 -03:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
03438b3b92
|
bad and bad
|
2024-04-12 22:09:57 -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
|
e3cfeb2579
|
Fix invalid proc reference in modular Sandstorm hugbot code
|
2024-04-06 22:07:57 -04:00 |
|
|
BongaTheProto
|
2709ec887c
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-06 19:06:12 -05:00 |
|
|
SandPoot
|
7ec9e65dcf
|
cease those screams
|
2024-04-05 18:39:33 -03:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
Elizabeth Lavenza
|
90378d4da9
|
Fix direct Destroy calls
|
2024-03-28 18:18:31 -04: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 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
BongaTheProto
|
1883c47d5c
|
basic ref regex
makes the proc calls compatible with 515
|
2024-03-11 19:46:05 -05: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 |
|
|
ariaworldandGitHub
|
a736dca31d
|
Merge branch 'SPLURT-Station:master' into tweak-undead
|
2024-01-08 23:47:14 +01:00 |
|
|
BongaTheProtoandGitHub
|
024052f016
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-08 16:32:10 -05:00 |
|
|
SandPoot
|
53c3850688
|
forgot it was overwritten i fucking hate skyrat
|
2024-01-08 14:35:59 -03:00 |
|
|
ariaworldandGitHub
|
fd2cf853ac
|
Merge branch 'SPLURT-Station:master' into tweak-undead
|
2024-01-05 00:58:00 +01:00 |
|
|
ariaworld
|
7d8180e48b
|
Rebalance + texts
|
2023-12-31 16:10:23 +01:00 |
|
|
ariaworld
|
236901ca0a
|
Text refactor + more layer shifting
|
2023-12-31 15:42:27 +01:00 |
|
|
ariaworld
|
7f940eba77
|
Quirk rebalance
|
2023-12-31 15:05:38 +01:00 |
|
|
BongaTheProto
|
750f742f95
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-28 18:31:39 -05:00 |
|
|
SandPoot
|
e7b267ca63
|
push
|
2023-12-27 01:06:25 -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 |
|
|
Kuki-konoandGitHub
|
7ff90e0275
|
Update gladiator.dm
|
2023-09-26 00:28:38 +01: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 |
|
|
Tsurupeta
|
07034d2ec0
|
sand
|
2023-08-08 14:01:15 +03:00 |
|
|
BongaTheProto
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|