Commit Graph

628 Commits

Author SHA1 Message Date
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
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
silicons
293404f728 Merge pull request #14258 from IronEleven/IronEleven-patch-1
Raises Space Vine Population Requirement
2021-02-20 03:02:24 -07:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Hatterhat
6d28c27f36 aoaoaoaooaoa 2021-02-17 23:24:44 -06:00
IronEleven
7ff8b41874 Update spacevine.dm 2021-02-16 09:14:27 -05:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Putnam
5c7ddaeedd Makes nightmare dynamic-controlled 2020-12-17 23:43:17 -08:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
e89e7da2fd Update xmas.dm 2020-12-13 18:55:07 -07:00
Putnam
c5e410c1bc Makes spontaneous brain trauma require min 5 players. 2020-11-22 00:12:54 -08:00