cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,652 Commits 10 Branches 0 Tags
af42aaa152cc6bc910df1f39959da40c16342478
Commit Graph

1863 Commits

Author SHA1 Message Date
Razgriz
af42aaa152 Merge pull request #5796 from Seris02/gunsprites2 
gun sprite chomp check
 2023-03-04 16:25:54 -07:00
Casey
beb3423544 Merge pull request #14575 from Screemonster/mineminemine 
Makes mining drones have a smarter IFF
 2023-02-27 18:58:23 +00:00
Seris02
2200cd9c10 almost made a big woops there weh 2023-02-26 12:38:24 +08:00
Seris02
246faa3c67 gun sprite chomp check 2023-02-26 10:21:42 +08:00
BlackMajor
7d72ebeb73 Don't spam admins please 2023-02-25 14:54:19 +13:00
BlackMajor
ef046afc8d Don't spam admin logs please 2023-02-25 14:52:23 +13:00
Cyrelius
152582a17e Update phase.dm 
Reverting changes on this branch, as it shouldn't have them.
 2023-02-11 21:16:16 -08:00
Cyrelius
204a328868 Merge branch 'CHOMPStation2:master' into items 2023-02-08 22:50:13 -08:00
Heroman3003
077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +00:00
Nadyr
914f627dc0 Merge pull request #5587 from CHOMPStation2/upstream-merge-14354 
[MIRROR] Event Stuff Bugfix/Balance Pass
 2023-01-27 10:17:52 -05:00
BlackMajor
353f4e1cab Merge branch 'master' into upstream-merge-14247 2023-01-25 14:01:30 +13:00
Cyrelius
ad04ddd57a Merge branch 'CHOMPStation2:master' into items 2023-01-22 18:27:58 -08:00
Cyrelius
ba133b2db0 Update phase.dm 
Reduced phase weapon charge cost across the board.
 2023-01-22 18:27:37 -08:00
Cyrelius
1c447bd7af Update energy.dm 
Discussion with Raz, increased range on phase weapons.
 2023-01-22 17:05:11 -08:00
Heroman3003
222ec534c8 Event Stuff Bugfix/Balance Pass 2023-01-22 01:33:56 +00:00
Razgriz
f4bfecb4e3 Nerf charging time of all frontier phasers 
-Nerfed charge time of all phasers by dividing phase_power by 8
 2023-01-20 18:18:29 -07:00
Razgriz
91d35cbf42 5.7 boolets 2023-01-19 14:17:31 -07:00
Razgriz
df94dd05f6 Add files via upload 2023-01-19 13:57:27 -07:00
Heroman3003
e9c2487299 Merge pull request #14290 from VOREStation/upstream-merge-8851 
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
 2023-01-04 02:56:23 +00:00
Casey
754c0af3c3 Gives pilots their holdout back 2022-12-26 02:11:48 +00:00
Nadyr
333ee6f107 powder that makes you say yes 2022-11-21 23:13:50 -05:00
Casey
7e8140b368 Merge pull request #14117 from Screemonster/shinealight 
Makes the unmaintained antique behave like one
 2022-11-21 01:34:16 +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
042366372e Merge pull request #5018 from CHOMPStation2/I-Will-Give-You-500-Dollars-to-fuck-off-conflicts 
[Manual MIRROR] Adds a ton more altevian stuff
 2022-09-22 22:24:16 -07:00
Razgriz
4b24086042 powder that makes you say yes 2022-09-22 21:55:43 -07:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
Novacat
06014fb014 Removes last references to simple_animal 2022-09-10 20:54:36 +00:00
Razgriz
36ec46103e powder that makes you say yes 2022-08-17 01:27:20 -07:00
Casey
6869732e32 adds cool and fun and totally balanced new weapon 2022-08-07 19:35:59 +00:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Victor Zisthus
245591be95 Shuttle/Voidcraft Hotfix 
Updates Shuttlecraft and Voidcraft to be visible by bullet penetration code. Things designed to fly in space at high speeds with lots of little rocks present are not gonna feel bullets all that much.
 2022-07-03 23:06:28 -04:00
Bib Bob
90fc75333c powder that makes you say yes? 2022-06-29 19:25:45 -05:00
Nadyr
a1a074cd80 powder that makes you say yes 2022-06-29 20:11:36 -04:00
Nadyr
7f856931e0 powder that makes you say yes 2022-06-29 19:13:55 -04:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Bib Bob
4b87ad705d Fixes missing sprites for the somatoray and advanced SMG 
Fine. I'll do it myself. Literally 1 line of code change fixes the invisible sprites, because all the gun DMI files are all over the place instead of a parent file anymore.

I tried to fix the WT-550 sprites too but I cant read the code and I AINT touching parent files any time soon.
 2022-06-28 21:00:39 -05:00
Bib Bob
5986fea6b3 Fixes missing sprites for the somatoray and advanced SMG 
Fine. I'll do it myself. Literally 1 line of code change fixes the invisible sprites, because all the gun DMI files are all over the place instead of a parent file anymore.

I tried to fix the WT-550 sprites too but I cant read the code and I AINT touching parent files any time soon.
 2022-06-28 20:30:20 -05:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
5fac79aa3c Merge pull request #13104 from foopwo/tasey 
Makes security cyborg taser cost the same charge as security's tasers.
 2022-06-19 01:00:38 +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
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
LordSaladin
b443ea1cb8 fixes the laws of thermodynamics for .45 LC i hope 
god imagine having to add mat values for all of these other bullets
 2022-05-05 16:36:49 +01:00
Nadyr
f3bdb597b8 Merge pull request #4124 from CHOMPStation2/upstream-merge-12796 
[MIRROR] Particle Gun Fix
 2022-04-23 18:10:04 -04:00
Casey
e3b147f3c3 Vision and Phaser Bug Fixes 2022-04-22 22:43:10 +00:00
LordSaladin
5fa1cfaa28 adds .45 LC to the autolathes 
now you can be a real space cowboy
 2022-04-20 19:45:16 +01:00
Casey
24e8977281 Particle Gun Fix 2022-04-20 08:25:42 +00:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Rykka
d3962b086b Sets Vepr to laser_overcharge HUD state. 2022-04-10 09:11:46 -06:00