MrJWhit
|
a324701730
|
Revert "adds cat meteors"
|
2021-06-13 05:25:02 -04:00 |
|
silicons
|
09d61c3bec
|
Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
|
2021-06-09 11:29:24 -07:00 |
|
silicons
|
224efa0e26
|
Merge pull request #14762 from DrPainis/patch-2
adds cat meteors
|
2021-06-09 11:21:55 -07:00 |
|
keronshb
|
70926f5daf
|
Merge remote-tracking branch 'upstream/master' into floorcluwneport
|
2021-05-31 22:21:34 -04:00 |
|
WanderingFox95
|
249d23a6cc
|
Fixed something with the event
|
2021-05-31 09:52:31 +02:00 |
|
WanderingFox95
|
2516afbbba
|
Cat Surgeon Event
If I did it right, thanks Keron!
|
2021-05-31 00:41:59 +02:00 |
|
DrPainis
|
d42fb1ae90
|
makes cat meteors significantly rarer than meaty ores
|
2021-05-27 12:17:41 -04:00 |
|
keronshb
|
8f1db2d5ec
|
Fixes some stuff
Actually ticks the spell, fixes the brain damage issue, etc.
|
2021-05-27 12:16:54 -04:00 |
|
DrPainis
|
1ce8ffba11
|
fixes the typepath for cat meteors
|
2021-05-27 11:48:09 -04:00 |
|
DrPainis
|
1b8ef53014
|
maybe makes this compile
|
2021-05-27 00:55:41 -04:00 |
|
DrPainis
|
cbb7673e79
|
Adds the actual event.
Yes, cat meteors have the same announcement as carp.
|
2021-05-27 00:30:29 -04:00 |
|
DrPainis
|
98d5499712
|
adds the cat wave_type
|
2021-05-27 00:25:55 -04:00 |
|
keronshb
|
78db6bd5c2
|
Ports Floor Cluwnes
Oh fuck oh god
|
2021-05-26 21:58:35 -04:00 |
|
Linzolle
|
1bb911441c
|
fix brand intelligence runtime
|
2021-05-24 17:53:05 -05:00 |
|
Lin
|
c0a56eb766
|
Merge pull request #14695 from Putnam3145/supernova-end-notification
Supernovae now announce when over, + other supernova tweaks
|
2021-05-10 01:24:05 -05:00 |
|
Putnam
|
8d96de6b03
|
More tweaks, whoops
|
2021-05-06 14:52:17 -07:00 |
|
Putnam
|
ecca9d788b
|
More supernova tweaks
|
2021-05-06 14:32:13 -07:00 |
|
zerothebigboy
|
90930494d6
|
k
|
2021-05-05 18:43:11 -04:00 |
|
zerothebigboy
|
c8ebe720ec
|
k
|
2021-05-05 18:25:05 -04:00 |
|
zerothebigboy
|
5138d86655
|
skylarlineman'safurry
|
2021-05-05 03:35:25 -04:00 |
|
Lin
|
f3ea2d58dc
|
Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
Pirate related fixes and communication console fixes
|
2021-04-14 21:39:06 -05:00 |
|
Hatterhat
|
32bbbecc39
|
pirate payoff minimum from 20k to 1k (#14581)
* removes 20k minimum on pirate payoff
* Update pirates.dm
|
2021-04-13 15:13:53 +02:00 |
|
Blue Wildrose
|
8b47786556
|
Pirate stuff and comm console fixes
|
2021-04-13 00:53:55 -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 |
|
LetterN
|
74c00d17f8
|
let's be [redacted], its really in t his year
|
2021-03-31 09:43:15 +08:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
Putnam
|
ac432bdd25
|
remember to compile before sending commits
|
2021-03-24 18:31:06 -07:00 |
|
Putnam
|
ebb233ab36
|
More supernova adjustments
|
2021-03-24 18:21:26 -07:00 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
silicons
|
74e26f7a0c
|
Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance
Buffed supermatter surge to make it up to 50x as strong as before.
|
2021-03-20 14:29:40 -06:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
DeltaFire
|
f99c17012c
|
removes jars from techweb
|
2021-03-15 22:26:05 +01:00 |
|
DeltaFire
|
039a337842
|
Merge pull request #14416 from GrayRachnid/abductors-more-players
Adjusts the abductors event to only trigger when there's 30 players.
|
2021-03-15 17:02:33 +01:00 |
|
Putnam
|
9a3e1d0307
|
wow that's REALLY REALLY BAD
|
2021-03-14 19:02:44 -07:00 |
|
Putnam
|
c9923f7e47
|
Tweaks supernova to not be inconsequential as often
|
2021-03-14 15:31:05 -07:00 |
|
Putnam
|
c8c3320789
|
Buffed supermatter surge 50x.
|
2021-03-14 15:17:47 -07: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 |
|
GrayRachnid
|
510ec3568b
|
Makes it so abductors require 30 players to trigger
|
2021-03-11 18:16:49 -05: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 |
|
Letter N
|
22b33d1a6e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-07 13:04:36 +08:00 |
|
silicons
|
4fdaf10049
|
Merge pull request #14359 from Hatterhat/traumannounce
funny trauma announce
|
2021-03-06 17:00:10 -07:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
Hatterhat
|
c02cf7d551
|
funny trauma announce
|
2021-03-02 22:35:08 -06:00 |
|
Putnam
|
291fc2add6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova
|
2021-03-02 01:33:22 -08:00 |
|
Putnam
|
38fb75c235
|
Prevents bloodsucker daytime-soon spam
|
2021-03-02 01:20:22 -08:00 |
|
silicons
|
3d417167c6
|
Merge pull request #14307 from Putnam3145/supermatter-events
Adds a new event: supermatter surge
|
2021-03-01 18:27:51 -07:00 |
|
Putnam
|
b2388c0f08
|
Removes auto-matchmaking from valentines event
|
2021-02-25 23:11:40 -08:00 |
|
Putnam
|
526105ffd6
|
Made it not announce 100% of the time
|
2021-02-24 03:35:30 -08:00 |
|
Putnam
|
04b5ee0b16
|
Adds a new event: "supermatter surge"
|
2021-02-24 03:29:19 -08:00 |
|
Putnam
|
23eaf250a9
|
Make sure to hit the funny tick
|
2021-02-24 03:12:01 -08:00 |
|