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-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
22590 Commits
Author SHA1 Message Date
Timothy TeakettleandGitHub 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
BongaTheProto 3f376c1bb3 Merge remote-tracking branch 'upstream/master' 2023-02-13 19:36:05 -05:00
BongaTheProto d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
SandPootandGitHub 4a01b9f5e2 Re-UI-ing (just steals old skyrat) (#302) 
* send it

* redefining counts as error, so goodbye
 2023-02-13 00:22:01 -03:00
BongaTheProto 0cfe8e33eb Merge remote-tracking branch 'upstream/master' 2023-02-12 21:42:34 -05:00
SandPoot 2b8a20bae2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-12 22:59:51 -03:00
Putnam3145 008eedfedc Fix shuttle catastrophe happening during transit 2023-02-12 17:12:52 -08:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
WoolyAypa e4d35beb7d hope it works 2023-02-11 16:28:54 -03:00
SandPoot 62806d0580 doesn't have all slots 2023-02-11 14:16:41 -03:00
SandPoot b62b5c3e12 fix more alt titles 2023-02-11 14:02:22 -03:00
WoolyAypa 94d24dfb31 mebbe? 2023-02-11 12:22:05 -03:00
Timothy TeakettleandGitHub 5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork 
Re-Adding Bounty Consoles
 2023-02-11 00:06:37 +00:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
Pin-alternative 828c84a4dd whoops 2023-02-10 23:26:59 +11:00
Pin-alternative 47d1e6ddb5 mod 2023-02-10 19:04:53 +11:00
Pin-alternative ec9ec618b2 b 2023-02-10 19:00:29 +11:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
Timothy TeakettleandGitHub 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
 2023-02-09 21:39:05 +00:00
Pin-alternative 4fe58fc420 add it back 2023-02-09 19:46:05 +11:00
Pin-alternative 4ee0be4a71 minmaxing 2023-02-09 19:30:26 +11:00
Lex 116dddc134 added datum and verbs for chane ai laws 2023-02-09 10:32:53 +03:00
SandPoot d29ce2328c some extra touches 2023-02-09 02:25:34 -03:00
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
Darius bcf5904b6c Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-08 21:49:37 -05:00
SandPoot 1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
BongaTheProto 79e84f961a le chars tm 
how do you even reach the saves limit brah
 2023-02-07 18:31:55 -05:00
BongaTheProtoandGitHub f5b1fab9be Merge pull request #723 from The-Real-Goku/photography-update 
Photography update
 2023-02-07 15:57:53 -05:00
BongaTheProtoandGitHub 3ec53fc81a Merge pull request #706 from KeplerWasTaken/sentientmobshelp 
Sentient Mobs by Sentience Potions will now receive an indicator
 2023-02-06 22:18:41 -05:00
SandPoot b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
BongaTheProto 2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
BongaTheProto 9e9f9915fa Merge remote-tracking branch 'upstream/master' 2023-02-03 17:23:22 -05:00
SandPoot 996e472f80 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-03 18:53:29 -03:00
Darius c6c05570be Remove additional non-modular heat checks 
Removes additional references to TRAIT_IN_HEAT TRAIT_HEAT_DETECT that were not properly addressed in the prior commit.
 2023-02-02 18:18:50 -05:00
Darius f2cf15c590 Refactor Dumb For Cum quirk 
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
 2023-02-02 17:21:54 -05:00
Darius 157db709ef Remove obsolete heat quirks 
Removes quirks In Heat and Estrus Detection, which were merged upstream into Sandstorm.
 2023-02-02 15:52:31 -05:00
zerothebigboy d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
BongaTheProto 7ebdfba5c9 modularize 
yep
 2023-01-30 17:57:24 -05:00
BongaTheProto 09ad5a268e Merge branch 'master' into pr/723 2023-01-30 17:07:20 -05:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot 8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
siliconsandGitHub 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -08:00
siliconsandGitHub fec5653da6 Merge pull request #15949 from SandPoot/fix-solar-runtimes 
Turns out the glass type giving you better stats didn't work
 2023-01-29 13:46:21 -08:00
siliconsandGitHub eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix 
update mentor admin log sql query
 2023-01-29 13:46:12 -08:00
siliconsandGitHub 5e30dad781 Merge pull request #15942 from LeDrascol/protolathe-ejection-improvements 
Protolathe material ejection improvements
 2023-01-29 13:46:01 -08:00
siliconsandGitHub e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet 
Fixes the tablet pen buttons
 2023-01-29 13:42:29 -08:00