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 2026-08-20 11:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
576 Commits
Author SHA1 Message Date
Mosley 24c0a1314f some fixes 
I have no idea if these works, this just allows the server to compile
 2025-04-24 17:18:02 -05:00
MosleyandGitHub 8749c4447d Merge pull request #1230 from SpaceCat404/Lucky's-Misc-Fixes-1 
Lucky's misc fixes 1
 2024-12-18 00:39:32 -05:00
MosleyandGitHub 4681496fcd Merge pull request #1225 from Cecily-C-Catherine/Dullahanborg 
Dullahanborg
 2024-12-14 19:32:48 -05:00
SpaceCat404andGitHub 8e7205e5a2 Merge branch 'master' into Lucky's-Misc-Fixes-1 2024-12-12 13:44:58 -06:00
SpaceCat404 56eb2a3621 Requested Fixes 2024-12-10 21:50:09 -06:00
SpaceCat404 43f63ecc52 Adds Squirm Emote 2024-12-10 07:14:59 -06:00
SpaceCat404 30920a735b Adds "I blew up Malaysia" emote 
Mostly did this so I could learn how.
 2024-12-06 19:36:10 -06:00
Cecily-C-Catherine d6983c052c Dullahanborg 
Adds the dullahanborg sprites
 2024-12-03 13:45:53 -06:00
Mosley 6f5b714487 fein fein fein fein fein 
I better get a dommy mommy for this
 2024-11-03 12:40:03 -05:00
Mosley c8ec16821c Update emotes.dm 2024-10-07 19:42:20 -05:00
Mosley 5776449a7e Revert "Merge pull request #11 from Just-Sim/the-great-culling" 
This reverts commit 0ed05ea49a, reversing
changes made to fcd83005e1.
 2024-10-07 19:26:52 -05:00
Mosley 14380b60a5 Merge remote-tracking branch 'venus/master' into content-stuff 2024-10-07 17:12:36 -05:00
Sim 863aa14576 Update emotes.dm 2024-10-05 13:33:13 -03:00
Sim 264c94d0df emote guide 2024-10-05 13:10:15 -03:00
SimandGitHub 1a2a8439c6 Merge branch 'master' into tgui-emote-2 2024-09-30 22:27:52 -03:00
Sim 64becded7f Ports the Emote Panel 
This Commit does the following:
Ports the Emote Panel
Turns SPLURT's emotes into /sound/human datums to reduce redundancy in the amount of emotes.
Gives almost every emote a name for the emote panel.
Removes herobrine.
Also fixes a few errors and makes sure all files are properly tested for Pull Request
 2024-09-30 21:48:48 -03:00
ariaworldandGitHub 0ed05ea49a Merge pull request #11 from Just-Sim/the-great-culling 
Emote Purge & Merges
 2024-09-28 19:10:53 +02:00
Sim a0d9b266b1 Merge branch 'the-great-culling' into tgui-emote-2 2024-09-28 13:10:33 -03:00
Sim f402b1aa4e Update emotes.dm 
adjusted cooldown
 2024-09-28 13:06:50 -03:00
Sim 1886ca472a update *burp, delete vore constants 
Why are these global variables but you handled emote lists as E.emote_list?? you call them once and never again!!!
 2024-09-28 12:58:15 -03:00
Mosley 9712521239 Merge remote-tracking branch 'venus/master' into content-stuff 2024-09-27 18:00:19 -05:00
Sim bc6603d187 quick fixes 
might as well update while I'm at it
 2024-09-26 02:24:44 -03:00
Sim 46a4d70658 quick fixes 2024-09-26 02:20:20 -03:00
Sim 128aec74a8 Purge & Merge Emotes 
Why is *help so big...
Also got rid of The Great SPLURT fart library.
 2024-09-26 02:08:14 -03:00
Sim 75205dbf2a Reverts 85f0f61, 9e8b4f3 & e252a00 
SPLURT maintainers try not to fuck up code challenge (impossible!) If you're gonna edit someone else's code, at least understand what you're editing please!
 2024-09-26 00:37:25 -03:00
Mosley 2e36296472 Revert "Update this too" 
This reverts commit 6c8eeacd87.
 2024-09-20 02:07:54 -05:00
Mosley 3a8024db6d undoes removals 2024-09-20 01:13:14 -05:00
ariaworld 6a6ffac524 Let's go GAMBLING!! 2024-09-15 16:53:17 +02:00
ariaworld 6c8eeacd87 Update this too 2024-08-29 14:57:51 +02:00
ariaworld 7e7e6be0fe Remove sad thing 2024-08-05 21:07:16 +02:00
ariaworld 29a9c5e88c Merge remote-tracking branch 'splurt/master' 2024-08-05 20:48:20 +02:00
ariaworld d2422de379 Removes N.2 unholy ERP verbs. Add: new textures for doors and floors. 2024-08-05 20:46:52 +02:00
MosleyandGitHub b0f3540997 Merge pull request #1169 from miguelop1/Bunny_ears 
Hare ears
 2024-07-27 16:00:08 -05:00
BongaTheProto b100b4fb2e fine, I'll do it myself 2024-07-27 15:48:10 -05:00
Lonofera e252a008f5 divide mrrp into mrrp and mrrp2 
sometimes u dont want to say this mrrmeow, just mrrp. QOL!
 2024-07-14 00:37:51 +03:00
Anonymous c65847c8fb codes new sprites in 
why trhe heck k4t getting me acting unwise
 2024-07-02 13:01:36 +03:00
Anonymous 13ec30b678 some stuff i guess idk 2024-07-01 23:27:32 +03:00
Aloraine fe69fd5c56 New Emote for Practice 
It's funny c:
 2024-06-16 19:25:06 -07:00
Lonofera 0801426b9b modular 2024-06-11 08:16:39 +03:00
BongaTheProtoandGitHub 08f72f8b09 Merge pull request #1162 from Zattarra-Red/AnimeEyes 
Adds Anime Eyes Marking.
 2024-06-06 19:49:45 -05:00
CommodoreNarwhal dea5e44971 Added hairstyle Thick (Long Alt) 2024-06-05 19:06:30 -04:00
El Derp o Derp d8f2c9c4f5 Adds anime eyes. 2024-06-04 00:14:13 -07:00
CommodoreNarwhal 2edaf134ba New Hairstyle 2024-06-01 20:45:31 -04:00
CommodoreNarwhal db7bea1f19 Update hair_head.dm 2024-06-01 20:20:55 -04:00
CommodoreNarwhal 2be155b172 Added two new hairstyles, Thick (Short) and Thick (Long) 2024-06-01 20:18:07 -04:00
BongaTheProto eca37136f0 followup 2024-05-29 18:05:29 -05:00
Anonymous a25fed3717 Ports smolraptors from Bubber's PR 2024-05-19 14:03:57 +03:00
ariaworldandGitHub 837adfc81d Merge branch 'SPLURT-Station:master' into comfy-erp 2024-05-09 22:36:38 +02:00
ariaworld 1ccaa9c70e forgot var define 2024-05-03 18:13:55 +02:00
ariaworld 05a98ac30f No hunger/thirst loss for standing still after 5 minutes! 2024-05-03 18:11:13 +02:00