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-28 15:17:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
112 Commits
Author SHA1 Message Date
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
SandPoot 6fb4267b56 upload 2023-08-04 23:26:33 -03:00
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03:00
BongaTheProto ac5b28c6c9 Merge remote-tracking branch 'upstream/master' 2023-04-05 20:15:22 -05:00
SandPoot 7033839c5a nice 2023-04-05 17:06:37 -03:00
CloverIsLuckyandGitHub fc0ed12307 Why would we need two mining points card? 2023-03-29 07:28:41 -06:00
BongaTheProto 2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -05:00
SandPoot 11a06b1686 pixelshift + layering 2023-02-21 14:27:10 -03:00
SandPoot 992d25ea08 Revert "pixelshift + layering" 
This reverts commit 51818478c5.
 2023-02-21 14:25:29 -03:00
SandPoot 51818478c5 pixelshift + layering 2023-02-21 14:20:48 -03:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPootandGitHub 117919fe2b Componentizes Interaction menu + prepares it for screentips by adding a shortcut (#301) 
* files

* let's just use our own parent

* necessary

* two istypes on a row
 2023-02-11 14:39:29 -03:00
BongaTheProto 86a1bb06b0 Merge remote-tracking branch 'upstream/master' 2023-02-02 18:56:02 -05:00
DariusandGitHub 2ae20de930 Port estrous quirks from SPLURT (#298) 
* Port estrous quirks from SPLURT

This commit ports quirks related to the animal breeding cycle from the downstream server SPLURT.

* Add null check for ashwalker round_season

Adds a null value check for round_id in ashwalker estrous code to prevent possible runtime issues.
 2023-02-02 20:29:18 -03:00
BongaTheProto 3ae8edf803 Merge remote-tracking branch 'upstream/master' 2023-01-22 01:06:28 -05:00
DariusandGitHub 3c4f222e40 Disable thirst for robotic species (#291) 
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
 2023-01-21 20:43:11 -03:00
SandPootandGitHub 79c8c61459 Makes skirt peeking into an element (#292) 2023-01-21 19:30:59 -03:00
zeroisthebiggayandGitHub c44a7e4f97 Update examine.dm 2023-01-16 19:17:25 -05:00
BongaTheProto 596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
SandPoot 8cf9db4faa lack of spess 2023-01-15 18:47:57 -03:00
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
BongaTheProto 606391308f Merge remote-tracking branch 'upstream/master' 2023-01-14 21:18:11 -05:00
SandPootandGitHub 0507960150 Does some skirt peeking optimization (#282) 2023-01-14 19:09:20 -03:00
BongaTheProtoandGitHub 36198f2b8c Merge branch 'Sandstorm-Station:master' into master 2022-10-16 17:49:02 -05:00
SandPootandGitHub b854771d79 Lets lizards have ears (#267) 2022-10-16 16:22:06 -03:00
BongaTheProto ae6a6b70e5 Merge remote-tracking branch 'upstream/master' 2022-10-09 12:57:48 -05:00
SandPoot 92f8d3debc i love invisible conflicts 2022-10-09 11:52:03 -03:00
BongaTheProto 054f2aa52d follow-up 2022-09-28 16:08:29 -05:00
BongaTheProto f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
NullFagandGitHub 723d2c8d0f Adds jumpskirt peeking (#264) 2022-09-28 16:16:06 -03:00
BongaTheProtoandGitHub 49055a7fef Merge branch 'Sandstorm-Station:master' into master 2022-09-08 10:34:50 -05:00
SandPoot 2ed861f2d7 bunch of code optimizations 2022-09-08 03:02:06 -03:00
SandPoot 2f92e8e4ca removes defunct code 2022-09-08 02:31:20 -03:00
BongaTheProto 6398d42cad oop! modularize 2022-07-26 00:13:15 -05:00
Turtle567 4f9a50b2c7 Buff Hiero Club, Chipped King Goat 
Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously.

Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"
 2022-07-25 16:47:28 -05:00
BongaTheProto 8edee48740 Merge remote-tracking branch 'upstream/master' 2022-07-15 18:57:20 -05:00
SandPoot abc70a16dd kills possible timer subsystem killer and stupid code that doesn't stop overflowing overlays for **** sake 2022-07-15 20:04:42 -03:00
BongaTheProto 04d9c7d167 Merge remote-tracking branch 'upstream/master' 2022-06-04 13:25:54 -05:00
SandPootandGitHub 461bfc3f9c Fixing some stuff about sizecode (#257) 2022-06-03 19:45:19 -03:00
BongaTheProto c0530b3650 Merge branch 'master' into prefs-update 2022-05-19 10:48:20 -05:00
BongaTheProtoandGitHub 2a481ecea8 Merge branch 'Sandstorm-Station:master' into master 2022-05-19 08:42:54 -07:00
SandPoot d0022f08bc No. 2022-05-19 11:57:25 -03:00
BongaTheProto b59cbac7a0 Update sif.dm 
I hate these too but I hate even more the unnecessary warnings in my vscode
 2022-05-09 07:27:55 -05:00
BongaTheProto 6306d05a18 Merge branch 'master' into prefs-update 2022-05-08 15:23:53 -05:00
Toxici11i 8f91555dd7 Massive update. 
Signed-off-by: Toxici11i
 2022-05-06 22:29:33 +01:00