Commit Graph

326 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01: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
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Putnam3145 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
silicons 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
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
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
keronshb 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
Lin 91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog
Dynamic messages admins if it fails to hijack.
2021-11-13 04:50:43 +00:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
Putnam3145 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
keronshb e20b5f7c92 Dynamicadmins
Messages admins if dynamic fails to hijack
2021-11-03 22:39:20 -04:00
keronshb b58d3f14a3 More adjustments 2021-10-30 10:24:58 -04:00
keronshb 133225c083 Removes required enemies 2021-10-28 23:48:50 -04:00
keronshb 02eb4685a9 Some adjustments 2021-10-28 23:44:02 -04:00
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
keronshb ccb65156ac Adjustments and fixes 2021-10-26 12:53:50 -04:00
keronshb 50986b279e Requirement rework 2021-10-25 21:14:25 -04:00
Putnam3145 53d7682a25 how embarassing! 2021-10-23 20:35:07 -07:00
Putnam3145 c26737a533 better rework: based on sec instead of pop on extended 2021-10-23 20:27:38 -07:00
Putnam3145 620721e89e No more "WE NEED ANTAGS" rolls 2021-10-23 19:59:12 -07:00
Putnam3145 343689ca42 even more proper 2021-10-19 00:07:14 -07:00
Putnam3145 c0db219693 Makes it actually take longer properly 2021-10-18 23:36:53 -07:00
SandPoot 17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
Putnam3145 14dee78daf add extended toggle to dynamic panel 2021-10-15 17:49:20 -07:00
keronshb 1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
keronshb bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Putnam3145 de51455fac Dynamic extended rewrite: some antags 2021-10-07 20:50:45 -07:00
keronshb 5c562959a9 Allows midround budget to be spent in extended 2021-10-07 14:12:37 -04:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
keronshb 5868c90fe8 Wizard fixes 2021-09-27 22:28:44 -04:00
keronshb eb548eb9b3 Fixes antag prefs breaking 2021-09-27 20:03:42 -04:00
keronshb 5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04:00
keronshb af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
keronshb fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb cbe221e18f Adds more blackbox stuff 2021-09-23 19:57:51 -04:00
keronshb c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
keronshb 0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00