cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,091 Commits 6 Branches 0 Tags
dba0bf4304a627d970d895fb7205fbd7245c0f94
Commit Graph

617 Commits

Author SHA1 Message Date
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
40f2b94b34 [MIRROR] fix clientless robot upgrade runtimes (#7574) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-18 22:40:05 +01:00
CHOMPStation2
8c8f025be3 [MIRROR] improved robot HUD handling (#7381) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-10 00:32:40 +01:00
CHOMPStation2
6c1fde4ff8 [MIRROR] robots can use melee weapon range, runtime fix (#7362) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-08 17:22:06 +01:00
Aroliacue
3117d9a8c9 Inventory Depth 2 (#7191) 2023-11-08 08:23:38 +01:00
Selis
e6932e98ba Revert "Ports Old Citcode Storage Reach" (#7184) 2023-11-07 15:40:39 +01:00
Aroliacue
1e09111bca Ports Old Citcode Storage Reach (#7182) 2023-11-07 13:37:46 +01:00
CHOMPStation2
6598c8c165 [MIRROR] Fixes wrong category of hud on the new buttons (#6799) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-14 11:17:55 +02:00
CHOMPStation2
6906262e67 [MIRROR] Fixes emag modules stacking (#6780) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-14 08:12:14 +02:00
CHOMPStation2
0078d339cc [MIRROR] Minor fixes to belly fullscreens (#6779) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-14 08:11:38 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
BlackMajor
7fd1ff3dc5 RCD Improvements + Holofans + fixes (#6738) 2023-08-06 17:07:59 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.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>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
Casey
41175bcb8e Autowhisper 2023-07-17 05:53:13 +00:00
Purdev
5cb195b303 Update alert.dm 
Minor fix because I accidentally fucked up a comment. -w-
 2023-07-08 12:03:32 -07:00
Purdev
b7b3c868d2 Adds Comments to alert.dm 
Adds missing comments.
 2023-07-08 12:02:39 -07:00
Digi Purpur
4ce1a6984c Band-Aid Fix 
Changing the too_much_tox alert to be actually "too much tox" and not "too much phoron".
After all... when a phoron breather is choking on oxygen, seeing a message say "HOLY SHIT YOU'RE CHOKING ON PHORON, STOP BRING BREATHING PHORON!" makes- well, no sense. :) ((I plan to come back to this and see if I can't make tox messages work better, but works for now.)
 2023-07-08 11:42:28 -07:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Darlantan
ac96197d7f VR code tweaks, mob TF, ghost joining, qdel to VR escapees 2023-05-24 08:42:09 -04:00
Nadyr
2caff25e68 Merge pull request #5943 from CHOMPStation2/upstream-merge-14604 
[MIRROR] [MIRROR] fixes a runtime in huds deleting and the gun deletion on login issue
 2023-03-17 03:35:45 -04:00
Nadyr
49ed07fc8f Merge pull request #5930 from CHOMPStation2/upstream-merge-14691 
[MIRROR] [MIRROR] Click catchers no longer display as Darkness
 2023-03-17 03:12:31 -04:00
Heroman3003
04b32c7886 Merge pull request #14604 from VOREStation/upstream-merge-8975 
[MIRROR] fixes a runtime in huds deleting and the gun deletion on login issue
 2023-03-14 21:45:18 +00:00
Heroman3003
5d0b1ca45c Merge pull request #14691 from VOREStation/upstream-merge-9045 
[MIRROR] Click catchers no longer display as Darkness
 2023-03-14 08:15:43 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Casey
d8f8f116bf Merge pull request #14141 from Heroman3003/smite-adjust 
Adjusts smite list
 2022-11-26 22:40:26 +00:00
Razgriz
5bd9ad5ea3 Merge pull request #5006 from CHOMPStation2/upstream-merge-12892 
[MIRROR] [MIRROR] Fixes zone_sel always having torso overlay (Able to be merged)
 2022-09-22 21:39:41 -07:00
VirgoBot
fd5c775809 [MIRROR] Fixes zone_sel always having torso overlay (Able to be merged) (#12892) 
* Fixes zone_sel always having torso overlay

* fix

Co-authored-by: Sypsoti <98442665+Sypsoti@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:05:00 +00:00
Casey
e78a07640f Fixes bluespace bag recursion disappearance 2022-09-23 01:00:28 +00:00
Casey
5e2328eba5 Fixes some runtimes (hopefully) 2022-07-19 23:44:16 +00:00
Casey
79f5dc9c3f Merge pull request #13150 from Heroman3003/runtime-2 
Fixes more runtimes
 2022-06-23 10:43:41 +00:00
Casey
3f2f7a1a37 More pAI interface! 2022-06-23 02:34:25 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
64e7ac79d6 Merge pull request #13071 from Very-Soft/pAIUI 
pAI hud revision
 2022-06-12 01:34:02 +00:00
Casey
15fedaf44e pAI UI 2022-06-10 11:45:56 +00:00
Nadyr
cfe574ae87 Merge pull request #4113 from CHOMPStation2/upstream-merge-12777 
[MIRROR] Makes Vision Overlays Not Painful
 2022-04-18 01:14:16 -04:00
Casey
9559af510c Merge pull request #12777 from Novacat/nova-basicfixes 
Makes Vision Overlays Not Painful
 2022-04-18 00:36:04 -04:00
Casey
133d479999 Merge pull request #12778 from Very-Soft/wowlessgreen 
Make meson vision less angry green
 2022-04-18 01:16:42 +00: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
0cdd2da44c Adds hud_states to almost all weaponry, credit to Serdy 
Reshuffles files to match Polaris
 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
Rykka
3b5c753b7b Start of TGMC Ammo HUD Port 
Ports Ammo HUD from TGMC, still WIP.
Progress Commit for tracking + allowing work on it later.
 2022-04-10 09:03:20 -06:00
Casey
d748d32e7b Merge pull request #12624 from VOREStation/upstream-merge-8507 
[MIRROR] Colors hud alerts according to their master object's color.
 2022-04-06 00:16:00 +00:00
Razgriz
80e65fa578 powder that makes you say yes 2022-03-30 21:56:57 -07:00
Razgriz
2012d9a6ff powder that makes you say yes 2022-03-30 21:56:16 -07:00
Razgriz
967186aeb6 powder that makes you say yes 2022-03-30 21:55:39 -07:00
Casey
977080b9ee Xenochimera QOL PR 2022-03-28 23:05:52 +00:00
Rykka
1cf587e89b Fixes small bug in Xenochimera Regen timer text 
For minutes, I gotta remember:
input should be ((deciseconds * 0.1) / 60). Oops.
 2022-03-25 12:39:04 -06:00
Rykka
e420e59751 Adds ChompEdit comments where applicable. 2022-03-24 19:49:10 -06:00