 Sara
|
5ba8c19b76
|
Plushie and Steppy
Fixes the susplush and steppy poster
|
2024-10-11 08:14:55 -06:00 |
|
|
ariaworld
|
e526ae6dd7
|
New plant sprites
|
2024-09-20 13:46:21 +02:00 |
|
|
ariaworld
|
d42c7a4f2a
|
Merge remote-tracking branch
|
2024-08-29 14:42:55 +02:00 |
|
|
BongaTheProto
|
68ff25e205
|
Merge branch 'master' into pr/784
|
2024-05-14 19:23:36 -05:00 |
|
|
Elizabeth Lavenza
|
ea6d8c3876
|
Fix Sandstorm-specific box overlay
|
2024-04-16 02:25:20 -04:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
Elizabeth Lavenza
|
77058b4a6b
|
Remove duplicated cyborg premium KA code
|
2024-04-01 16:05:35 -04:00 |
|
|
Elizabeth Lavenza
|
a627a617c6
|
Fix lewd decals not merging properly
|
2024-04-01 11:33:31 -04:00 |
|
|
Elizabeth Lavenza
|
0f21ae0c97
|
Fix lewd decals runtiming when qdeleted after spawn
|
2024-04-01 11:33:31 -04:00 |
|
|
BongaTheProto
|
d25ca12420
|
Merge remote-tracking branch 'upstream/master' into 515-auxmos
|
2024-03-31 21:32:20 -05:00 |
|
|
SandPoot
|
8e01485ff5
|
oh no, we want to go to C rather
|
2024-03-30 23:24:39 -03:00 |
|
|
SandPoot
|
30e4caff28
|
i think this was the intention?
|
2024-03-30 23:18:38 -03: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 |
|
|
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 |
|
|
AzarakandGitHub
|
c17eef2cec
|
Merge branch 'master' into jank
|
2024-03-09 22:35:42 +01:00 |
|
|
ariaworld
|
6318464f06
|
Fix mecha mobs + add a chocolate box and letter to Hilbert's hotel
|
2024-03-02 18:26:56 +01:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
SandPootandGitHub
|
419f3b5ac8
|
Merge pull request #367 from DetectiveEnotsky/patch-1
Allows you to pick your character for certain ghost roles
|
2024-01-19 22:01:03 -03: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
|
2cefedd316
|
push
|
2024-01-16 16:54:53 -03:00 |
|
|
ariaworldandGitHub
|
0ec0526c3f
|
Merge branch 'SPLURT-Station:master' into december-qol
|
2024-01-08 23:46:12 +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 |
|
|
ariaworld
|
fde8d80de6
|
Merge remote-tracking branch 'upstream/master' into december-qol
|
2024-01-02 21:16:39 +01: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 |
|
|
ariaworld
|
e9592e18fc
|
Merge remote-tracking branch 'upstream/master' into december-qol
|
2023-12-23 15:00:19 +01:00 |
|
|
ariaworld
|
22befe7327
|
Winter QOL
|
2023-12-23 14:59:11 +01:00 |
|
|
BongaTheProto
|
32b361c846
|
followup
|
2023-12-15 18:38:06 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
bfc964b76b
|
do you know the definition of insanity
|
2023-12-09 20:27:19 -03:00 |
|
|
ariaworld
|
b329192691
|
Modularize lewd decals!
|
2023-11-19 03:10:02 +01:00 |
|
|
ariaworld
|
70f8ca22d8
|
Remove: Old return TRUE statement.
|
2023-11-18 18:17:30 +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 |
|
|
ariaworld
|
e98019e91e
|
Push, push, push.
|
2023-11-17 21:34:27 +01:00 |
|
|
BongaTheProto
|
73700f9417
|
Merge branch 'master' into pr/784
|
2023-11-06 15:48:57 -05:00 |
|
|
BongaTheProto
|
37bbecefb4
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 18:01:32 -05:00 |
|
|
SandPoot
|
9dcb996901
|
additional
|
2023-11-04 01:11:52 -03:00 |
|
|
SandPoot
|
3bb6783438
|
content
|
2023-11-03 21:17:22 -03:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPoot
|
e46983c7b7
|
no renaming
|
2023-10-03 22:37:41 -03:00 |
|
|
SandPoot
|
90677d70db
|
avoid overriding the upstream code
|
2023-10-03 22:27:12 -03:00 |
|
|
SandPoot
|
e153f780e5
|
actually not needed now
|
2023-10-03 20:57:13 -03:00 |
|
|
SandPoot
|
62c6b6881d
|
ACTUALLY BAD, IT'S INHERITING FROM THE OTHER LIZARD!
|
2023-10-02 23:12:50 -03:00 |
|
|
SandPoot
|
db926e7cb1
|
not needed
|
2023-10-02 22:58:43 -03:00 |
|
|
SandPoot
|
cd12c202c4
|
updates, modularizing and generally making the code better
|
2023-10-02 22:53:21 -03:00 |
|
|
Марк
|
e8c0eaa1c1
|
Plushies.
|
2023-10-03 04:04:54 +05:00 |
|