76042510df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-01-28 19:21:39 -03:00
cae94afdb7
push
2025-01-26 18:06:36 -03:00
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
8516b07eee
please do not end your paths with /
2024-03-13 14:43:40 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
4e9ff44ee7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-29 15:49:14 -03:00
ce1d757159
Merge pull request #16016 from SandPoot/throwing-update
...
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
b9a422ee2d
throw at mobs laying down
2023-12-18 14:07:25 -03:00
653b767f32
remove antags for borging...
2023-12-17 23:35:51 -03:00
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
c519c1e128
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-21 15:00:51 -03:00
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
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
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
096ca5c1e7
WOW I WROTE THIS WRONG GOOD IT WASN'T MERGED
2022-09-04 14:39:50 -07:00
d9b51fa748
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-31 19:39:24 -03:00
11a28d2d3f
Makes from-ghost midrounds not roll if no ghosts
2022-08-31 15:05:37 -07:00
3700b9bbe5
Allows setting antags to "low"
2022-08-21 16:42:39 -07:00
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03:00
e1c822cbd8
TGUI; actually fixes station announcer
2022-08-07 17:17:58 -07:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
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
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
2d0637221a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-04 00:59:26 -03:00
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
ca74834260
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-08 15:17:23 -03:00
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
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
3f9ad6a954
should do this instead
2021-11-14 22:44:43 +01:00
50c7d4914f
reebe loading (woo)
2021-11-14 22:25:39 +01:00
cabebe0fd0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-14 16:31:13 -03:00
91adaf84b6
Merge pull request #15330 from keronshb/dynamiclog
...
Dynamic messages admins if it fails to hijack.
2021-11-13 04:50:43 +00:00
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
SandPoot