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-07-11 15:53:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph

132 Commits

Author SHA1 Message Date
Mosley 106d5b3c1e Merge remote-tracking branch 'upstream/master' 2024-08-25 12:48:45 -05:00
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03: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
ariaworld 149454a316 Fix sanitization 2024-01-18 23:23:52 +01:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03: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
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03: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
WoolyAypa 9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
WoolyAypa af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot c8df97474b Adds pick-up, drop and throw sounds for items. (#240) 2022-04-01 15:57:30 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
keronshb 9f13c7d8f3 Last roundup of fixes 2021-10-16 10:45:44 -04:00
SandPoot b23b88524d Upload files 2021-09-28 22:03:17 -03:00
keronshb 834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
Letter N 09ce499146 aeiou 2021-03-01 21:55:34 +08:00
Letter N cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Letter N 64f9605b51 map conflict any% 2021-01-02 19:56:04 +08:00
Letter N 56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
Trilbyspaceclone 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
Letter N 3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Trilbyspaceclone 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Trilbyspaceclone e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
TrilbySpaceClone 8b406df1ec mk III 2020-06-05 22:43:49 -04:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000 9a4432b3ac initial commit 2020-02-06 00:03:17 -07:00
kevinz000 927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters" 
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
 2020-02-05 23:50:41 -07:00