Mosley
0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
SandPoot
76042510df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-01-28 19:21:39 -03:00
SandPoot
cae94afdb7
push
2025-01-26 18:06:36 -03:00
BongaTheProto
1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
SandPoot
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
SandPoot
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
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
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
BongaTheProto
a9715638ad
Merge remote-tracking branch 'upstream/master'
2024-01-02 01:00:59 -05:00
SandPoot
4e9ff44ee7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-29 15:49:14 -03:00
deathride58 and GitHub
ce1d757159
Merge pull request #16016 from SandPoot/throwing-update
...
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
BongaTheProto
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
SandPoot
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03: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
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
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
silicons and GitHub
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
Mosley