cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

54249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BongaTheProto
1f58235a4a Merge remote-tracking branch 'upstream/master' 2023-04-03 11:52:47 -05:00
SandPoot
9d214e2f9d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-04-03 12:53:37 -03:00
Changelogs
6beb065bc6 Automatic changelog compile [ci skip] 2023-04-02 21:28:51 +00:00
SPLURT Bot
9192e00684 Automatic changelog generation for PR #803 [ci skip] 2023-04-02 21:27:11 +00:00
BongaTheProto
db1ac71d9b Merge pull request #803 from SPLURT-Station/we-be-stealing-again 
Ports a bunch of suits
 2023-04-02 16:25:43 -05:00
BongaTheProto
a570656e86 Update TauStation.dmm 2023-04-02 14:45:21 -05:00
BongaTheProto
2ae52fb536 Merge pull request #802 from SPLURT-Station/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2023-04-01 20:41:48 -05:00
SPLURT-Station
24ac0ea29b Update TGS DMAPI 2023-04-02 00:34:40 +00:00
BongaTheProto
815afcc45a suits 
all the suits from that file
 2023-04-01 16:01:05 -05:00
Lin
654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2 
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
 2023-04-01 00:17:22 -07:00
Changelogs
20011e773d Automatic changelog compile [ci skip] 2023-03-31 03:18:35 +00:00
SPLURT Bot
fef2636058 Automatic changelog generation for PR #799 [ci skip] 2023-03-31 03:17:02 +00:00
BongaTheProto
95b944500a Merge pull request #799 from legumesan/upstream/dawgdoin 
just a dorky hairstyle
 2023-03-30 22:15:37 -05:00
BongaTheProto
443c8a2009 modularizes 2023-03-30 21:32:14 -05:00
legu!
38e002e449 just a dorky hairstyle 
hehe fluffy hair :dawgdoin:
 2023-03-31 03:08:33 +02:00
BongaTheProto
a3cdbf3d1c Merge branch 'Sandstorm-Station:master' into master 2023-03-30 19:20:25 -05:00
BongaTheProto
f1cc5d6fc1 Merge pull request #754 from SPLURT-Station/artist-names 
Splashscreen sauces
 2023-03-30 18:57:24 -05:00
Changelogs
bb453e8145 Automatic changelog compile [ci skip] 2023-03-30 23:55:36 +00:00
SPLURT Bot
f4a42557ab Automatic changelog generation for PR #798 [ci skip] 2023-03-30 23:54:01 +00:00
BongaTheProto
aac88197bc Merge pull request #798 from SPLURT-Station/remove-protolock 
Removes access lock from protolathes and other machines
 2023-03-30 18:52:34 -05:00
SandPoot
66a61e52c6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-30 15:25:34 -03:00
Changelogs
14e46b4601 Automatic changelog compile [ci skip] 2023-03-30 16:51:01 +00:00
SPLURT Bot
111fcbab00 Automatic changelog generation for PR #795 [ci skip] 2023-03-30 16:49:17 +00:00
BongaTheProto
975d65f246 Merge pull request #795 from PhazeJump/Dragon-Eastern-tail-wagging-fix 
Minor tail fixes
 2023-03-30 11:47:35 -05:00
BongaTheProto
5f1492c192 #freeprotolathe 2023-03-30 11:09:33 -05:00
BongaTheProto
c15d6c571a Update chat_commands.dm 2023-03-30 10:22:15 -05:00
PhazeJump
11e6f3ca80 Revert western dragon tail tweak 
honestly, I have tested it and when it doesn't sway as much, it does have a heavier feel, as it is this large. Looks and feels a little bit better this old way.
 2023-03-30 11:33:09 +02:00
PhazeJump
2387eed838 Fix for succubus tail 
succubus tail doesn't have an animation as it doesn't exist at all, but at least now it doesn't disappear
 2023-03-30 11:27:06 +02:00
BongaTheProto
7bf1b9a0a6 adds media and color to embeds 2023-03-29 22:30:00 -05:00
Changelogs
7fb9b11f57 Automatic changelog compile [ci skip] 2023-03-30 02:38:16 +00:00
SPLURT Bot
6f06e8d84e Automatic changelog generation for PR #793 [ci skip] 2023-03-30 02:36:28 +00:00
BongaTheProto
4d036ae8cf Merge pull request #793 from KeplerWasTaken/variousfixes 
Cryo messages fixes, BO & BS greetings tweaks, Die of Fate is kill
 2023-03-29 21:34:58 -05:00
Changelogs
fd6070db0a Automatic changelog compile [ci skip] 2023-03-30 02:28:36 +00:00
SPLURT Bot
be45576f3a Automatic changelog generation for PR #796 [ci skip] 2023-03-30 02:26:53 +00:00
BongaTheProto
cc0623cad2 Merge pull request #796 from CloverIsLucky/patch-2 
Removes duplicated mining points card from Minerborg.
 2023-03-29 21:24:22 -05:00
CloverIsLucky
fc0ed12307 Why would we need two mining points card? 2023-03-29 07:28:41 -06:00
PhazeJump
3e7af2ce61 western dragon tail mirrored when looking north 2023-03-29 10:49:23 +02:00
BongaTheProto
70ca275bd8 Update chat_commands.dm 2023-03-29 00:05:07 -05:00
BongaTheProto
2df434efc8 Update chat_commands.dm 
makes it neater with the new embed system
 2023-03-29 00:02:50 -05:00
BongaTheProto
2898741253 Merge branch 'master' into artist-names 2023-03-28 23:03:40 -05:00
Changelogs
f4323c4119 Automatic changelog compile [ci skip] 2023-03-29 02:54:53 +00:00
SPLURT Bot
e47d3adc6b Automatic changelog generation for PR #792 [ci skip] 2023-03-29 02:53:29 +00:00
BongaTheProto
403e33252e Merge pull request #792 from NopemanMcHalt/pain-agony-even 
Pain... Agony, even.
 2023-03-28 21:38:51 -05:00
BongaTheProto
3b451c5b4b Merge pull request #794 from SPLURT-Station/tgs-dmapi-update 
Automatic TGS DMAPI Update
 2023-03-28 21:19:17 -05:00
BongaTheProto
ffafd8e48b Update _job_alt_titles.dm 2023-03-28 20:52:08 -05:00
BongaTheProto
df95b9fa51 Merge remote-tracking branch 'upstream/master' 2023-03-28 20:52:02 -05:00
SPLURT-Station
f6ce4b186a Update TGS DMAPI 2023-03-29 00:37:32 +00:00
PhazeJump
538ef4457c fixes this damn eastern dragon tail line 
someone wrote "Eastern Dragon" instead of "Dragon Eastern" and the animation did not play properly
 2023-03-28 23:58:45 +02:00
SandPoot
be2ada97ee Merge pull request #322 from Fennec82/arfs-ports 
Add sprite accessories from ARFS
 2023-03-28 18:40:27 -03:00
KeplerWasTaken
02c20c35e4 Mafia verb removal 2023-03-28 23:22:55 +02:00