cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 10 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

568 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
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBot
891d585ede [MIRROR] Space Traffic Update, Cleanup, & KHI Removal (#9600) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 21:10:26 +01:00
CHOMPStation2
464ebe7360 [MIRROR] Glamour mob pack (#9225) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-13 22:31:24 +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
99830636d9 [READY] Walks back combat refactor, plus ammo balance changes (#8728) 2024-08-13 18:11:04 -04:00
Kashargul
0ab421aabe undefines our defines (#8506) 2024-06-09 18:58:36 +02:00
Guti
7c3fb6fb64 Maintenance Deck (#8146) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-04-07 08:25:38 +02:00
CHOMPStation2
39ab514759 [MIRROR] fixes broken chars (#7892) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-03-10 14:51:55 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +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
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05: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
Aroliacue
213a952c4a Exploration Equipment Vendors and misc changes (#7616) 2024-01-28 18:25:39 -05:00
CHOMPStation2
b6eea9b639 [MIRROR] Raptor sprite overhaul (#7633) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-01-27 19:57:44 +01:00
FluffMedic
f320278b8d Trying to remove Mob Hardstuns (#7266) 2023-12-12 20:09:30 +01:00
CHOMPStation2
4667401397 [MIRROR] Redgate Laserdome (#7319) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-03 12:54:20 +01:00
Aroliacue
7368ed0071 [READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-07-31 15:00:03 +02:00
Aroliacue
e737cb1fc5 Damage reduction, new sound effects 2023-07-12 10:15:40 +10:00
Razgriz
4aaf01a5bb Merge pull request #5714 from Cyrelius/Weapons/Armour 
Energy Weapons Balance Pass.
 2023-06-23 23:44:04 -07: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
Cyrelius
08013d2cca Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-06-02 09:56:38 -07:00
Nadyr
2466d8cdba Merge pull request #6137 from CHOMPStation2/upstream-merge-14812 
[MIRROR] Ion Beam Redux
 2023-04-25 22:15:41 -04:00
Nadyr
d7e6bacafd powder that makes you say yes 2023-04-25 21:44:57 -04:00
Heroman3003
1ddb447c1b Merge pull request #14814 from KillianKirilenko/kk-shottedgun 
Shotgun Tweak
 2023-04-23 20:51:38 +00:00
Heroman3003
317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
BlackMajor
6057d2ee1f Update bullets_ch.dm 2023-03-17 16:28:18 +13:00
Rykka Stormheart
640a73cb06 Adds Deafened Feedback, enhances looping sounds further 
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.

Example of deafened feedback [here](https://streamable.com/8s8vlu). 

Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing. 

It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
 2023-03-03 04:08:08 -08:00
Cyrelius
d6f084007d Update energy.dm 
Comment old parts of energy.dm that have been moved.
 2023-03-01 08:56:21 -08:00
Cyrelius
1eb0b03a8e Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-03-01 08:53:21 -08: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
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
b006405262 Update energy_ch.dm 
Moving Phase weapon changes here.
Giving phase weapons -armour penetration in a similar manner as hollow point bullets to make armour better against them.
 2023-02-24 17:14:11 -08:00
Cyrelius
bb2abab20f Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-02-12 21:28:18 -08:00
Cyrelius
b5d1414976 Update beams_ch.dm 
Adjusted phaser damage, now no longer do bonus damage to humanoid simple mobs.  In exchange, they've been buffed a bit.
 2023-02-04 20:51:19 -08:00
Cyrelius
1c447bd7af Update energy.dm 
Discussion with Raz, increased range on phase weapons.
 2023-01-22 17:05:11 -08: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
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
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
Rykka
d3962b086b Sets Vepr to laser_overcharge HUD state. 2022-04-10 09:11:46 -06:00
Rykka
50b98e7f35 Remove CHOMPEdit codes + _ch files added, given upstream ports in progress 
As stated, per maintainer/headmin request (and common sense).
 2022-04-10 09:04:18 -06:00
Rykka
26fbd5e3cb TGMC Final Commit - Fixes Ammo Count + symbols + Medigun/Curabitur 
Changes:
- Code copied over to hud.dm and commented out, to prep for upstream pull.
- Commented-out, unused code removed.
- CHOMPEdits removed, pending upstream PR.
- Medigun no longer shows 2x the actual ammo loaded.
- Curabitur now fetches the amount of shots correctly, bar 1 extra for some reason.
- Curabitur ammo updates on automatic recharge ticks.
- A ton of projectile get_ammo_count optimization - mostly swaps the massive if/else for for loops. Fixes multiple guns not getting ammo properly, now casings won't register as ammo unless they have a shell in the casing.
- hud_state_empty defined as base on all bullets.
- Corrects energy weapons missing a hud_state_empty.
- Gives Ion weapons a hud_state_empty

All changes have been tested, and bar the Curabitur having an extra shot for ??? reason, which is a base bug I've yet to fix, this is entirely ready for testmerge.
 2022-04-10 09:04:18 -06:00
Rykka
92ccb52ca7 Multiple Testing Fixes 
- Fixes all projectile guns not having an empty state after unloading the gun via various methods
- Fixes stun revolver not having an empty sprite
- Fixes self-charging guns not updating ammo counts

Still needing fixes:
- Revolvers do not update ammo counts after firing, only on emptying the gun/adding new shells.
 2022-04-10 09:04:18 -06:00
Rykka
f84c9d720f Fixes issues with HUDs not updating 
Forces updates upon cycling the next round.
Fixes Chambered casings still counting for ammo despite having no associated projectile. Because for ~realism~ the casing has a BB var that determines if we currently have a bullet available to fire.
Adds rocket states for our ONE measly rocket launcher.
Phasers will now update their ammunition count on every single pump.
 2022-04-10 09:04:18 -06:00
Rykka
7cedcee7bc Fixes Compile time errors 2022-04-10 09:04:18 -06:00