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-21 19:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1832 Commits
Author SHA1 Message Date
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
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +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 e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
siliconsandGitHub c2f1e24223 Merge pull request #15832 from Putnam3145/from-ghost-check 
Makes from-ghost midrounds not roll if no ghosts
 2022-09-23 16:21:08 -07:00
Putnam3145 096ca5c1e7 WOW I WROTE THIS WRONG GOOD IT WASN'T MERGED 2022-09-04 14:39:50 -07:00
BongaTheProto b287251261 Merge remote-tracking branch 'upstream/master' 2022-08-31 19:46:05 -05:00
SandPoot d9b51fa748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-31 19:39:24 -03:00
Putnam3145 11a28d2d3f Makes from-ghost midrounds not roll if no ghosts 2022-08-31 15:05:37 -07:00
Putnam3145 3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -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 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05: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 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
BongaTheProto b437b03b48 Merge remote-tracking branch 'upstream/master' 2022-02-13 13:40:33 -05:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
BongaTheProto f18f566e4d Merge remote-tracking branch 'upstream/master' 2022-02-04 00:16:28 -05:00
SandPoot 2d0637221a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 00:59:26 -03:00
SakuraGitHubPutnam3145
 		08b38a7e70 Ashwalker Update (#15466) 
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-02-03 19:34:15 -08:00
BongaTheProto c7bd65b1a6 Merge remote-tracking branch 'upstream/master' 2021-12-08 15:01:52 -05:00
SandPoot ca74834260 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-08 15:17:23 -03:00
keronshbandGitHub 6ab0d1b70c Adds Clock Cult to the midround pool. (#15338) 
* Midround Clock Cult

Adds midround clock cultists

* Is eligible

* Reebe load proc

* Moves load reebe

* One tab out
 2021-12-08 19:06:11 +01:00
James 9258b93f64 Modularises (most of) the code into EROS module folder 2021-12-05 19:39:24 +00:00
James 2f85224b04 Cleanup and radio announcements 2021-12-05 14:12:39 +00:00
James 738e009078 Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff. 2021-12-04 06:02:40 +00:00
James f3726aba32 Added slave collars, slave console and modified comms console 2021-12-02 17:01:23 +00:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
DeltaFire 3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire 50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
SandPoot cabebe0fd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-14 16:31:13 -03:00
LinandGitHub 91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog 
Dynamic messages admins if it fails to hijack.
 2021-11-13 04:50:43 +00:00
SandPoot 3da59fc38c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-05 14:27:17 -03:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
Putnam3145andGitHub b2459a26a3 Merge pull request #15306 from keronshb/dynamicadjustments 
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
 2021-11-04 16:27:58 -07:00