Commit Graph

877 Commits

Author SHA1 Message Date
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Rykka
553f1bba47 Missing Gun Sprite Fixes
- Fixes C20R missing sprite when empty
- Fixes Z8/Z9 missing sprite when empty
- Fixes Laser Cannon not having a sprite at all
- Fixes Xray Laser not having a sprite at all
- Fixes Anti-Particle Weapons (yes all of them) not having sprites
- Fixes Alien Pistol missing sprite + missing beam
- Fixes Mini-Uzi missing sprite when magazine removed/empty

Fixes https://github.com/CHOMPStation2/CHOMPStation2/issues/4101
2022-05-21 17:17:12 -06:00
Nadyr
672c5ed903 Merge branch 'master' into upstream-merge-12842 2022-05-01 17:34:09 -04:00
Razgriz
37480fabd2 Merge pull request #4074 from KeRSedChaplain/postthisratvar
attempting to re-ignite my desire to code by adding a funny poster
2022-04-27 02:24:59 -07:00
Casey
35df5c5164 Adds PoI loader landmarks 2022-04-26 21:24:23 +00:00
Casey
c2f7c28dbb GBWilds 2022-04-24 00:33:52 +00:00
Dan-Neposh
03b0f32d8e forgot the comment message :pain: 2022-04-23 05:17:22 -04:00
Dan-Neposh
608dcaa80e puts the poster into _ch files 2022-04-23 05:15:16 -04:00
Dan-Neposh
532e01f0e8 adds the poster icon and decal 2022-04-16 04:07:53 -04:00
Casey
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
Casey
88df18c3a5 Merge pull request #12669 from GhostActual/aurora_toys
Aurora Toys
2022-04-06 08:29:25 +00:00
Casey
c9e34e6e2a Merge pull request #12333 from VOREStation/upstream-merge-8356
[MIRROR] Fixes non-growing spiderlings growing.
2022-02-27 20:08:22 +00:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
d38c2c3ac3 Return to Tether 2022-02-06 14:05:08 +00:00
Verkister
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
Nadyr
001ca8885f Merge branch 'master' into upstream-merge-11848 2021-12-12 05:43:50 -05:00
Nadyr
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
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
CHOMPStation2
3145b5fe94 powder that makes you say yes 2021-12-09 23:58:53 -07:00
Casey
2484838ed4 EVENTS AND LANDMARKS - OH BOY MORE COMEDY 2021-12-10 05:19:50 +00:00
Casey
3b90133c20 SpaceVines - Now with 100% More Landmark Moments 2021-12-10 04:36:44 +00:00
Casey
0d5546e11d Merge pull request #11768 from Heroman3003/posterfix2
Fixes a broken poster
2021-12-08 23:43:29 +00:00
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Casey
a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey
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 Sieyes
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
Nadyr
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
Nadyr
e4d8e5263e Merge branch 'master' into upstream-merge-11434 2021-08-25 23:19:08 -04:00
Nadyr
56d22684cc powder that makes you say yes 2021-08-25 23:18:21 -04:00
Nadyr
228cc8e096 powder that makes you say yes 2021-08-25 23:17:27 -04:00
Nadyr
4d023f33f1 powder that makes you say yes 2021-08-25 23:15:44 -04:00
Nadyr
8ebb7450a3 powder that makes you say yes 2021-08-25 22:18:11 -04:00
Novacat
ab680fd295 Upstream-11434 2021-08-24 21:11:09 -07:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
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 Sieyes
7aec486d70 Merge pull request #11296 from VOREStation/Arokha/randomfixes
Two random map fixes
2021-07-29 20:09:10 +00:00
Aronai Sieyes
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
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179
[MIRROR] Optimize a couple things
2021-07-20 21:45:26 -04:00
Nadyr
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
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00