1120 Commits
Author SHA1 Message Date
CaseyandCHOMPStation2 27c8b16a2b Merge pull request #12692 from VOREStation/upstream-merge-8505
[MIRROR] Spiderlings die if they have 0 health
2022-04-11 19:26:47 +00:00
CaseyandCHOMPStation2 88df18c3a5 Merge pull request #12669 from GhostActual/aurora_toys
Aurora Toys
2022-04-06 08:29:25 +00:00
TheGreatKitsune 6f1d71eb04 Add updates from master to resolve merge conflicts... 2022-03-21 10:31:12 -05:00
TheGreatKitsune d64f94f815 Non crew role added 2022-03-20 12:28:10 -05:00
CaseyandCHOMPStation2 c9e34e6e2a Merge pull request #12333 from VOREStation/upstream-merge-8356
[MIRROR] Fixes non-growing spiderlings growing.
2022-02-27 20:08:22 +00:00
NadyrandGitHub 33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
CaseyandCHOMPStation2 80e943716f talon miner 2022-02-06 23:21:47 +00:00
CaseyandCHOMPStation2 d38c2c3ac3 Return to Tether 2022-02-06 14:05:08 +00:00
VerkisterandGitHub 921c1d6337 Possibly fixes some spiderling jank
Ran out of brain juice trying to figure out the bugginess further but the wacky placement of this stuff got me sussy enough to try something. will see if anything happens and maybe toss upstream if so.

If my hunch is correct this might fix excess unregistered spiderling spawning and the bug with infinitely squishable undeleted squishees.
2022-02-03 19:08:30 +02:00
NadyrandGitHub 001ca8885f Merge branch 'master' into upstream-merge-11848 2021-12-12 05:43:50 -05:00
NadyrandGitHub b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
2021-12-12 05:39:43 -05:00
CaseyandChompstation Bot 9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
CHOMPStation2andGitHub 3145b5fe94 powder that makes you say yes 2021-12-09 23:58:53 -07:00
CaseyandChompstation Bot 2484838ed4 EVENTS AND LANDMARKS - OH BOY MORE COMEDY 2021-12-10 05:19:50 +00:00
CaseyandChompstation Bot 3b90133c20 SpaceVines - Now with 100% More Landmark Moments 2021-12-10 04:36:44 +00:00
CaseyandChompstation Bot 0d5546e11d Merge pull request #11768 from Heroman3003/posterfix2
Fixes a broken poster
2021-12-08 23:43:29 +00:00
NadyrandGitHub 680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
CaseyandChompstation Bot a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
CaseyandChompstation Bot fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Chompstation Bot 60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Aronai SieyesandChompstation Bot 0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +00:00
Verkister 2bccef7423 adds double upstreams too 2021-10-22 17:23:07 +03:00
Chompstation Bot ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Rykka 22c3378198 Fix Relative pathing because AGONY.
Stop relatively pathing stuff. PLEASE.
2021-09-25 12:33:00 -07:00
NadyrandGitHub 4584e40c24 Merge pull request #2994 from CHOMPStationBot/upstream-merge-11522
[MIRROR] Overhauls Resin ability, deletes unused xeno sprites, fixes few things.
2021-09-24 17:00:00 -04:00
Chompstation Bot 5ca0ff4c15 Update mob spawners/spawns 2021-09-24 03:22:28 +00:00
Chompstation Bot 4dd3ea4d15 Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-09-24 03:19:02 +00:00
BlackMajor 5fcab51a86 Hyper pads from cit 2021-09-08 16:45:59 +12:00
NadyrandGitHub e4d8e5263e Merge branch 'master' into upstream-merge-11434 2021-08-25 23:19:08 -04:00
NadyrandGitHub 56d22684cc powder that makes you say yes 2021-08-25 23:18:21 -04:00
NadyrandGitHub 228cc8e096 powder that makes you say yes 2021-08-25 23:17:27 -04:00
NadyrandGitHub 4d023f33f1 powder that makes you say yes 2021-08-25 23:15:44 -04:00
NadyrandGitHub 8ebb7450a3 powder that makes you say yes 2021-08-25 22:18:11 -04:00
NovacatandCadyn ab680fd295 Upstream-11434 2021-08-24 21:11:09 -07:00
Aronai SieyesandCadyn 72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai SieyesandChompstation Bot 7463a1bd6e Merge pull request #11368 from VOREStation/Arokha/closetanim
Port of monster860's animated doors to Bay closets
2021-08-09 03:28:57 +00:00
Chompstation Bot 21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Aronai SieyesandChompstation Bot 7aec486d70 Merge pull request #11296 from VOREStation/Arokha/randomfixes
Two random map fixes
2021-07-29 20:09:10 +00:00
Aronai SieyesandChompstation Bot 1a4d49d422 Merge pull request #11293 from VOREStation/upstream-merge-8174
[MIRROR] Custom poster fix
2021-07-29 03:07:40 +00:00
Chompstation Bot 58a498c918 Expands spider features 2021-07-22 16:20:15 +00:00
NadyrandGitHub 2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
2021-07-20 21:45:26 -04:00
NadyrandGitHub b48ecdbc98 Merge pull request #2601 from CHOMPStationBot/upstream-merge-11112
[MIRROR] Xenomorph Overhaul and fixes from Gurgstation
2021-07-20 21:04:13 -04:00
NadyrandGitHub 744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
NadyrandGitHub 12997ce830 powder that makes you say yes 2021-07-20 18:53:55 -04:00
Chompstation Bot 15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot 7437154387 Allows hiding mobs/areas from observers without completely forbidding 2021-07-20 15:03:10 +00:00
Chompstation Bot b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
NadyrandGitHub 257787e880 powder that makes you say yes 2021-07-16 18:13:42 -04:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
NadyrandGitHub 20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
2021-07-15 20:26:17 -04:00