cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-09 16:09:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,063 Commits 9 Branches 0 Tags
2ec2ff9e42b5d5cda3c8da112e1195c6cf7736b3
Commit Graph

905 Commits

Author SHA1 Message Date
Nadyr
ca5ee82b75 Merge pull request #5559 from CHOMPStation2/upstream-merge-14344 
[MIRROR] better persistent dirt
 2023-01-27 09:32:25 -05:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
30c9c0517c Merge pull request #14344 from Seris02/emissiveborgs 
better persistent dirt
 2023-01-19 02:33:01 +00:00
Verkister
c921b14c36 Update misc.dm 2023-01-11 11:44:26 +02:00
Verkister
9f7ff4e0ca A couple dirt fixes 
Fixes all cleanable decals (such as graffiti and such) creatign a huge pile of dirt onto the turf when spawned.
Also fixes decal dirt staying as a persistable decal after spawning despite its coded behavior being supposed to just dirty the turf into a regular dirt overlay.
 2023-01-11 07:56:51 +02:00
Casey
63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Razgriz
120047e124 Port missing PR - [MIRROR]SSmachines optimizations (#5403) 
* Update Fire.dm

* Update machines.dm

* Update fuel.dm
 2022-12-15 21:49:31 -07:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Heroman3003
11ee3ee08e Merge pull request #14164 from VOREStation/upstream-merge-8852 
[MIRROR] Cleanable robo remains
 2022-12-03 20:12:44 +00:00
Casey
9922942a73 Merge pull request #14048 from Very-Soft/fixbumptele 
Fix bump teleporter
 2022-11-06 21:49:52 +00:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
Razgriz
81da61dd70 Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2 
Fixes some small transit bug.
 2022-10-15 23:13:16 -07:00
BlackMajor
24c64ae0a6 Fixes 2022-10-16 11:33:57 +13:00
Nadyr
39b30a4196 powder that makes you say yes 2022-10-11 20:18:53 -04:00
Casey
9665bac0b5 Merge pull request #13859 from Cameron653/FLYING 
ALL TERRAIN WINGS
 2022-10-10 03:03:42 +00:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed 
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
 2022-10-02 21:39:21 -07:00
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
Casey
6b01537fa3 Fixes runtime with cryopods 2022-09-18 09:39:31 +00:00
TheGreatKitsune
d41e1e902c Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-08-21 09:12:31 -05:00
Poojawa
575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey
4f4b6fdf9a Merge pull request #13351 from Heroman3003/dirtfix 
Makes persistant dirt not reset its alpha after some dirtying
 2022-07-17 09:33:51 +00:00
Novacat
ffc07aab0f Merge pull request #13224 from Heroman3003/spiderlingnefr 
Makes spiderlings not vencrawl when they're more than 75% grown
 2022-07-01 21:25:06 +00:00
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
TheGreatKitsune
8b58b4c2c0 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-04-18 12:18:34 -05: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
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
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