cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,766 Commits 8 Branches 0 Tags
897c1135fa9ea226720f8c54166566b54c5eabd1
Commit Graph

542 Commits

Author SHA1 Message Date
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
Rykka
1c2111f488 Xenochimera QOL Improvements 
Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch.
Defibrillators will now apply halloss to Xenochimera and set them feral on revive.
Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation.
Reconstitution cooldown reduced from 1 hour to 10 minutes.
Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating.
Regeneration will now have an audible + visible cue that plays on a 2% chance.
Xenochimera have gained the Lick Wounds Verb.
 2022-03-22 08:31:34 -06:00
Rykka
1bde2cdf09 Xenochimera Ferality Reduction while in belly 
Xenochimera will now reduce ferality at a tickrate of 1 per Life tick while inside a belly, same as the hunger reduction if they're full.
They will not experience hallucinations and will get safety messages while inside a belly, as well as the status indicator confirming they're safe even in a lit environment.
 2022-03-10 15:18:19 -07:00
Razgriz
ab494dfe5c Throwing QoL 
Revival of #3047 and #3115
 2022-03-01 01:34:53 -07:00
Razgriz
d4e8d5c0d6 Merge pull request #3721 from CHOMPStation2/upstream-merge-11700 
[MIRROR] [MIRROR] Minor bodytemp warning refactor.
 2022-02-28 22:50:55 -07:00
Nadyr
5682aa2120 powder that makes you say yes 2022-02-19 19:43:34 -05:00
Casey
c94588fd28 Merge pull request #11700 from VOREStation/upstream-merge-8335 
[MIRROR] Minor bodytemp warning refactor.
 2022-02-19 22:12:40 +00:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Rykka Stormheart
a0366cd9b6 Revert "[MIRROR] [MIRROR] Throw Mode QoL Tweaks" 2021-09-28 18:16:44 -07:00
Chompstation Bot
adf03713ba [MIRROR] Throw Mode QoL Tweaks 2021-09-27 18:30:42 +00:00
Aronai Sieyes
99d4db145d Merge pull request #11499 from VOREStation/upstream-merge-8233 
[MIRROR] Ports sliding things along tables
 2021-08-26 20:17:48 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus 
Make nif/crafting menu buttons not be hidden
 2021-07-11 19:14:17 +00:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera 
Fix security cameras showing weird space thing
 2021-07-07 21:15:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
lm40
af32042b15 fixes #10700 (#10763) 
* Update human.dm

* Update robot.dm

* Update simple_hud.dm
 2021-06-27 16:10:18 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
9f13f4e505 Merge pull request #10658 from ShadowLarkens/patch-1 
Just don't print item attack messages on attackby
 2021-06-16 00:47:44 +00:00
Chompstation Bot
0f30402e40 [MIRROR] Portable mapping devices 2021-06-14 18:37:53 +00:00
Novacat
7bce90d577 Merge pull request #10495 from Very-Soft/ghostsandgateways 
Ghosts can only go through the gateway if it's turned on
 2021-05-30 19:00:19 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00