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 19:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
2333 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
deathride58andGitHub e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable) 
Maptext()s the maptexts
 2023-12-12 19:21:17 -05:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
BongaTheProto e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
Putnam3145GitHubDeltaFire
 		9c4792ea80 Some dynamic midround tweaking (#15841) 
* midround wizard, blob

* make dynamic respect midround pref, too

* Makes attempt_replacement not just make traitors

* Tried to make it poll if you wanna be a wizard

* something is going to happen in 1 minutes

* i left it half finished!

* This one seems a bit over the top

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2023-11-13 13:00:04 +01:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -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
siliconsandGitHub 98c0f38de3 Merge pull request #15999 from SandPoot/do_after 
Implements timed_action_flags for do_after-like procs
 2023-09-14 17:59:55 -07: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
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +03:00
BongaTheProto 5382130370 Squashed commit of the following: 
commit 0081f9fa79
Author: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date:   Mon Jul 31 18:40:02 2023 +0000

    Automatic changelog compile [ci skip]

commit 94be79788c
Merge: 13da11c4bc ee540149d8
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:38:17 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit ee540149d8
Merge: c317c8b8fc 410d80987e
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Mon Jul 31 11:37:20 2023 -0700

    Merge pull request #15994 from SandPoot/quick-fix-1

    Fixes changeling's stings

commit 13da11c4bc
Merge: 8b56f314e6 c317c8b8fc
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:36:19 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit 410d80987e
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:04:52 2023 -0300

    nope, who OWNS it

commit 860f75d464
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:02:51 2023 -0300

    go

commit c317c8b8fc
Merge: 19dee4e0f6 bfe07112ff
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Sun Jul 30 10:49:51 2023 -0700

    Merge pull request #15993 from SandPoot/station-name

    New Station Trait: Randomizing Station Name

commit bfe07112ff
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Fri Jul 28 13:53:09 2023 -0300

    i hate keyed_list, i'm not keeping it in

commit 6896a2e481
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Thu Jul 27 21:09:41 2023 -0300

    what was it again?
 2023-08-01 00:22:39 -05:00
SandPoot 94be79788c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-31 15:38:17 -03:00
SandPoot 410d80987e nope, who OWNS it 2023-07-31 15:04:52 -03:00
SandPoot 860f75d464 go 2023-07-31 15:02:51 -03:00
BongaTheProto ea324c5bc1 Merge remote-tracking branch 'upstream/master' 2023-07-28 20:43:43 -05:00
SandPoot 789534ac63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-28 18:36:03 -03:00
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
BongaTheProto ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot b62b5c3e12 fix more alt titles 2023-02-11 14:02:22 -03:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -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
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
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
Dan-Neposh 274269c2b8 surely my code works every time 2022-10-19 01:32:34 -04:00
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
Dan-Neposh a447d337a8 misc balance changes 2022-10-06 00:22:51 -04:00
BongaTheProto 917eeb756a Merge remote-tracking branch 'upstream/master' 2022-09-03 16:42:38 -05:00
SandPoot 2d9b6d8fc5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-03 17:02:15 -03:00
Putnam3145 c5d1a5f590 sleep tight, disky 2022-08-29 21:35:54 -07:00
BongaTheProto cfb1e2caff Merge remote-tracking branch 'upstream/master' 2022-08-20 11:30:21 -05:00
SandPoot 6b481d2d66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-19 23:29:29 -03:00
Putnam3145 228c637d76 Probably fixes bad stake behavior 2022-08-17 19:19:50 -07:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03: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
BongaTheProto 9e980f825f Merge remote-tracking branch 'upstream/master' 2022-08-01 17:19:36 -05:00
SandPoot 105251893d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-01 12:45:35 -03:00
Putnam3145 a54fdd1d13 whoops you can check_tick this just fine i think 2022-07-28 17:24:42 -07:00
BongaTheProtoandGitHub 43829e47e4 Merge branch 'Sandstorm-Station:master' into master 2022-07-24 13:29:11 -05:00
SandPoot 8e71dbe371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 15:07:34 -03:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00