Commit Graph

1779 Commits

Author SHA1 Message Date
SandPoot
8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
SandPoot
676cb864b1 missed proc refs 2024-03-12 22:17:30 -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
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
653b767f32 remove antags for borging... 2023-12-17 23:35:51 -03:00
SandPoot
27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -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
SandPoot
11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03: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
Putnam3145
e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07: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
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Sakura
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
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
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
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
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03: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
29a01f2d05 Antag Info and fixing the handshake finally 2021-10-14 20:43:41 -04:00
keronshb
e2ab532de2 Removes old gangs, families is almost ready 2021-10-12 16:34:27 -04:00