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
56,903 Commits 55 Branches 0 Tags
some-updates
Commit Graph
787 Commits
Author SHA1 Message Date
Elizabeth Lavenza b3ab704dee Fix bad proc references in core code 2024-04-06 20:58:32 -04:00
BongaTheProto 9faeb05972 fixes wrong verb references 
Regex is a double edged sword.
Also fixes a bug I hadn't noticed in mentor verbs
 2024-03-31 22:00:37 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -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
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
BongaTheProto 13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -05:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
MysteryMan21333 06153ae98f Xenobiology V1.0 2023-10-14 07:15:46 -05:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
BongaTheProto 0cfe8e33eb Merge remote-tracking branch 'upstream/master' 2023-02-12 21:42:34 -05:00
Putnam3145 008eedfedc Fix shuttle catastrophe happening during transit 2023-02-12 17:12:52 -08: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
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -05:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
BongaTheProtoandGitHub 4a4f4aaa54 Merge branch 'Sandstorm-Station:master' into master 2022-10-18 23:18:56 -05:00
deathride58andGitHub 2d5f5d6c52 Merge pull request #15833 from Hatterhat/cluwne-drop 
drops floor cluwnes (random event max occurrences 0)
 2022-10-16 13:09:21 -04:00
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
shellspeed1 44536ad7ab Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen. 2022-09-20 16:57:49 -07:00
shellspeed1 40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. 2022-09-18 22:40:07 -07:00
shellspeed1 aa7252ffd6 port of https://github.com/Skyrat-SS13/Skyrat-tg/commit/418c58a9c3c8b78c0577e150ad891aba8d7a7731 to make pad deconstructible. 2022-09-18 22:13:44 -07:00
Hatterhat 892deb2c20 zzzz 2022-08-31 20:34:35 -05:00
BongaTheProto b287251261 Merge remote-tracking branch 'upstream/master' 2022-08-31 19:46:05 -05:00
Putnam3145 0a31d4cf12 Made some events still show messages with intern 2022-08-29 03:06:21 -07:00
Putnam3145 babb333779 nerf untied shoes event 2022-08-26 18:56:30 -07:00
BongaTheProto cfb1e2caff Merge remote-tracking branch 'upstream/master' 2022-08-20 11:30:21 -05:00
Putnam3145 81cbda5cda announcement too 2022-08-18 01:15:34 -07:00
Putnam3145 6847ef3db5 sandstorm nerf 2022-08-18 01:13:05 -07:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
BongaTheProtoandGitHub 74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
Putnam3145 8ab1a12ef7 i forgot to compile?? 2022-08-02 23:15:10 -07:00
Putnam3145 0238d9fbe5 make it actually do something lol 2022-08-02 21:50:56 -07:00
Putnam3145 db06dbcd58 forgot to commit and push 2022-08-02 16:44:05 -07:00
Putnam3145 8456caa095 Makes untied shoes take lacing difficulty into account 2022-08-02 13:28:01 -07:00
BongaTheProto 9e980f825f Merge remote-tracking branch 'upstream/master' 2022-08-01 17:19:36 -05:00
deathride58andGitHub 5d0c6405c6 Merge pull request #15730 from Putnam3145/event-rebalance 
Rebalances some events
 2022-07-30 11:27:08 -04:00
Putnam3145 5ec0f537eb C 2022-07-28 17:25:46 -07:00
Putnam3145 6e0a17a525 Untied shoes: a minor event of little consequence 2022-07-28 17:19:35 -07:00
Putnam3145 70ff90adcf the risks of having disabled code 2022-07-28 16:56:12 -07:00
Putnam3145 01c945d690 Rebalances some event player counts 2022-07-28 16:18:35 -07:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
BongaTheProto a72b79f56c Merge remote-tracking branch 'upstream/master' 2022-07-20 21:41:02 -05:00