cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,675 Commits 10 Branches 0 Tags
master
Commit Graph
1120 Commits
Author SHA1 Message Date
RaeschenandGitHub 9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00
Raeschen 74765cf864 fix merge conflicts 2023-06-19 12:32:36 +02:00
RaeschenandGitHub 64558e6f77 Merge pull request #6391 from CHOMPStation2/upstream-merge-15022 
[MIRROR] Forbidden Tuna
 2023-06-19 11:10:10 +02:00
Heroman3003andCHOMPStation2 db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
RaeschenandGitHub 1cffb3f0e7 Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds 
Sound Additions + Tweaks
 2023-06-18 16:27:37 +02:00
Digi Purpur 47d6a439f1 All the changes required for coilgun FXs to work 
Changes object/effects from "pointdefense" to "coildefense" to use when you prefer "projectile" PD turrets (point defense turrets vars and such should just use the old laser effects for cases where we wanna use those instead of the new ones Rykka and I added here!)
 2023-06-17 09:04:05 -07:00
Heroman3003andCHOMPStation2 2313a67318 Merge pull request #15022 from Youtubeboy139/Landmines 
Forbidden Tuna
 2023-06-17 06:36:11 +00:00
Heroman3003andCHOMPStation2 2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
NadyrandGitHub 0de160aae6 powder that makes you say yes 2023-05-29 19:21:31 -04:00
NadyrandGitHub c189294aaf powder that makes you say yes 2023-05-29 19:18:33 -04:00
Heroman3003andCHOMPStation2 f9aaa6e264 Remove two maw posters and butt from default spawning 2023-05-28 22:27:09 +00:00
Heroman3003andCHOMPStation2 317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
CaseyandCHOMPStation2 1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Heroman3003andCHOMPStation2 18002a78a1 Merge pull request #14681 from VOREStation/upstream-merge-9029 
[MIRROR] Sheet storage has different caps per type.
 2023-03-14 08:08:13 +00:00
RazgrizandGitHub 6d9cbfb0f8 MORE SPIDERS 2023-02-13 23:10:47 -07:00
NadyrandGitHub ca5ee82b75 Merge pull request #5559 from CHOMPStation2/upstream-merge-14344 
[MIRROR] better persistent dirt
 2023-01-27 09:32:25 -05:00
RazgrizandGitHub 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
Heroman3003andCHOMPStation2 30c9c0517c Merge pull request #14344 from Seris02/emissiveborgs 
better persistent dirt
 2023-01-19 02:33:01 +00:00
VerkisterandGitHub c921b14c36 Update misc.dm 2023-01-11 11:44:26 +02:00
VerkisterandGitHub 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
CaseyandCHOMPStation2 63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
CaseyandCHOMPStation2 764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
RazgrizandGitHub 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
NovacatandCHOMPStation2 1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Heroman3003andCHOMPStation2 11ee3ee08e Merge pull request #14164 from VOREStation/upstream-merge-8852 
[MIRROR] Cleanable robo remains
 2022-12-03 20:12:44 +00:00
CaseyandCHOMPStation2 9922942a73 Merge pull request #14048 from Very-Soft/fixbumptele 
Fix bump teleporter
 2022-11-06 21:49:52 +00:00
NadyrandGitHub d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
RazgrizandGitHub 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
NadyrandGitHub 39b30a4196 powder that makes you say yes 2022-10-11 20:18:53 -04:00
CaseyandCHOMPStation2 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
RazgrizandGitHub 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
VirgoBotandCHOMPStation2 4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
CaseyandCHOMPStation2 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
PoojawaandCHOMPStation2 575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
CaseyandCHOMPStation2 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
NovacatandCHOMPStation2 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
CaseyandCHOMPStation2 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
NadyrandGitHub 672c5ed903 Merge branch 'master' into upstream-merge-12842 2022-05-01 17:34:09 -04:00
RazgrizandGitHub 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
CaseyandCHOMPStation2 35df5c5164 Adds PoI loader landmarks 2022-04-26 21:24:23 +00:00
CaseyandCHOMPStation2 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