Commit Graph

1681 Commits

Author SHA1 Message Date
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Putnam3145
630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
MrJWhit
a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Putnam
86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
DrPainis
2eeb6ede1e lowers cat meteor threat and makes them use the cat meteor sprite 2021-05-27 12:20:54 -04:00
DrPainis
d199f0585a adds cat meteors
because funny
2021-05-27 00:23:24 -04:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
Putnam3145
e509f1956d Removed cloning destroy; removed commented-out objs (#14539) 2021-04-02 19:48:55 +02:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
silicons
d9a2316825 fix 2021-03-20 12:13:28 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
Putnam
f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
Putnam
d990328e29 Added a "no antags please" button 2021-03-16 22:37:39 -07:00
Letter N
42c04ea087 solarss 2021-03-12 12:28:19 +08:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
silicons
7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos
Adds recent-chaos weighting for secret
2021-03-10 14:02:11 -07:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
Putnam
25b021a343 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos 2021-03-10 00:06:40 -08:00
silicons
9110ebcac1 Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff
Allows repeated mode adjust to be >100 total
2021-03-09 00:20:29 -07:00
Putnam
5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08:00
Putnam
a651b629c9 Allows repeated mode adjust to be >100 total 2021-03-07 19:28:50 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
keronshb
952d2e1e60 Removes the power sink objective
Alternative to the other PR
2021-02-07 23:41:27 -05:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
DeltaFire
e24eb14121 args
these are needed for the CI not to fail, even if unused in most cases.
2021-01-20 16:32:15 +01:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
silicons
c58a32b9c5 Merge pull request #13820 from DeltaFire15/temp-reebe-removal
[TESTMERGE ONLY] Temporarily disables Reebe
2020-12-22 09:35:47 -07:00
silicons
db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Putnam
f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam
a3f2ae3333 i'm such an idiot. 2020-12-19 20:27:07 -08:00
Putnam
c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option.
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam
f840965763 no autotraitor, better logging 2020-12-19 18:04:22 -08:00
DeltaFire
7d4de6b8d0 screamies 2020-12-20 02:32:59 +01:00
Putnam
fb31117a8d nah nah none of that. 2020-12-18 22:36:41 -08:00
Putnam
5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
Putnam
dd61efbc60 Made dynamic respect midround antag setting (HOW) 2020-12-17 23:29:25 -08:00