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
79,499 Commits 10 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

518 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
2428c6a221 [MIRROR] fix sawn off shotguns (#9777) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-03 21:51:53 +01:00
Kashargul
801238f4d2 [Manual Port] of #16707 Enable define sanity (#9651) 2024-12-16 23:31:49 +01:00
CHOMPStation2StaffMirrorBot
a967fb3861 [MIRROR] Check for 516 byond:// hrefs (#9624) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-13 00:55:48 +01:00
Kashargul
fe4b5ec2cb finish up the spans (#9605) 2024-12-09 22:51:05 +01:00
Kassc
a2d798a978 Map fixes relic1.0 (#9370) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-30 20:16:13 +01:00
CHOMPStation2StaffMirrorBot
09f82b6fff [MIRROR] The final action buttons PR (#9324) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-27 00:00:36 +02:00
CHOMPStation2
45025bd128 [MIRROR] Ports tgstation/tgstation/pull/15673 (#9270) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-20 23:08:28 +02:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
Kashargul
a92a42b85b converts our spans (#9185) 2024-10-07 20:47:23 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
tacoguy7765093
52b6b89a1e Fixes gun in-hand, changes default gun sound, adjusts gun sounds. (#8819) 2024-08-23 14:21:07 +02:00
tacoguy7765093
d3167feb2c Fixes a handful of weapons shooting the wrong projectile, phase weapon nerf, floragun buff, one merc nerf. (#8791) 2024-08-22 12:48:46 +02:00
tacoguy7765093
99830636d9 [READY] Walks back combat refactor, plus ammo balance changes (#8728) 2024-08-13 18:11:04 -04:00
Cadyn
abc16a2e2a The big ammo simplification (#8171) 2024-06-25 13:57:20 +02:00
Raeschen
2e48d9419b Revert magazine sizes in combat refactor (#8033) 2024-03-23 10:28:34 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01:00
tacoguy7765093
c262e908b9 bandaid fixes some invisible guns (#7077) 2023-10-04 21:40:59 -04:00
CHOMPStation2
3663946898 [MIRROR] Altevian Adjustments - Descriptions & Small Tweaks (#7072) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:58:54 -04:00
CHOMPStation2
dc189c0b16 [MIRROR] Killian's Grab Bag PR (#6880) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-29 17:30:20 +02:00
CHOMPStation2
ec735809c5 [MIRROR] A bunch of small fixes (#6820) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:46:36 +02:00
Aroliacue
690596cbf8 C-20R rework, new wielded gun sprites 2023-07-14 17:33:51 +10:00
Aroliacue
efcaab7427 Merge branch 'master' into aro_firearms 2023-07-12 10:23:17 +10:00
Aroliacue
7b6cdfbdf4 More inaccuracy, movement delay removal 2023-07-12 10:14:12 +10:00
Aroliacue
31bb617dc9 P90K Revamp 2023-07-12 07:39:22 +10:00
Raeschen
83d3648d3d some name reversions 2023-07-11 18:55:18 +02:00
Raeschen
709308d2c3 manual check of all files 2023-07-11 18:10:13 +02:00
Nadyr
0ed727001f powder that makes you say yes 2023-07-11 18:10:07 +02:00
Casey
8c6de9128a Firearms 2 
Rebase to master
 2023-07-11 18:09:13 +02:00
Raeschen
e048b3a314 Fixes several missing texture objects 2023-06-25 15:38:45 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +00: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
Bib Bob
90fc75333c powder that makes you say yes? 2022-06-29 19:25:45 -05: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
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
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Rykka
7cedcee7bc Fixes Compile time errors 2022-04-10 09:04:18 -06:00
Rykka
ce6f0e568c Makes Projectile Ammo HUD code work! 
Now to just get all the boolets to have `hud_state`s set. D:
 2022-04-10 09:03:20 -06:00
Rykka
85e69ffba4 Progress Commit 2 - Energy Gun HUD works, starting Projectiles 
Saving progress to resume later.
 2022-04-10 09:03:20 -06:00
Razgriz
23930aac17 Merge pull request #4036 from SilencedMP5A5/ocelot_do_a_thing 
More gun tweaks
 2022-04-09 14:06:30 -07:00