Commit Graph

1558 Commits

Author SHA1 Message Date
FartMaster69420 dfbdd237de Merge branch 'master' into xenobio-upgrades 2022-04-09 12:53:04 -04:00
Rykka 2bb6c955ba TGMC Ammo HUD Earlyport
Ports over TGMC's Ammo HUD and all relevant code, adapted to work for Polaris's guns. This took me several days, but hey, I learned a bunch. <:
Time to port Aim Mode + Mentorhelp. :3c 
- All guns now have an ammo HUD sprite. If one lacks one, it will be ??? or blank, at which point, make an issue report, as all guns should be working by now.
- Guns will display how many rounds they have left until ammunition runs dry.
- Ammo will only count the casings that CURRENTLY have a projectile in them. This is slightly unrealistic, yes, but it is better and more intuitive for the player. This also enables guns like the revolver to work, given they recycle casings.
- Up to 4 ammo HUDs can be displayed at once, but given we lack TGMC's attachments and guncode, you'll only ever usually see 2. TBD on porting over TGMC guncode. <:
- Ammunition for multiple guns has different colors in the HUD based on what you currently have loaded.
- If you're looking at this later on to add new things. DON'T USE _FLASH IN THE HUD_STATE_EMPTY. THE _FLASH IS ADDED ON BY CODE.
- Grenades have a hud_state, pending us ever porting over a grenade launcher. Rockets ALSO have a hud_state.


Example of Laser/Energy Weapons:
https://i.imgur.com/MGvqGxh.mp4
Captain's Gun:
https://i.imgur.com/Wd0SS3C.gif

Full Test of all weapons:
https://streamable.com/usp4dy

Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/4033
Earlyport of https://github.com/PolarisSS13/Polaris/pull/8513, with adaptations for VORE's files (Specifically the ML3M medigun and cell-loaded weaponry.)

Credit to @SilencedMP5A5 for helping me with sprite names, testing, and making the Full Test video. <3
2022-04-07 01:58:37 -06:00
FartMaster69420 2d243de4e1 Update dartgun_vr.dm 2022-03-31 15:08:07 -04:00
GhostActual 7dced2cc17 Base Commit 2022-03-24 16:35:34 -04:00
Pandora 7172b97982 Ne Ne Ne Ne... 2022-03-21 21:55:37 +00:00
GhostActual 96d2da15a3 Base Commit
Update shotgun.dm

Final Commit?

Final
2022-03-21 05:02:08 -04:00
GhostActual 1ba2e8d6d6 Whoops 2022-03-18 23:50:01 -04:00
GhostActual 25f3367a3c Adds the two extra guns back to the sidearm box 2022-03-18 23:50:01 -04:00
GhostActual 47b9f404f6 Base Commit
Whoops

Not supposed to be here

Idea I had in the middle of the night that wanted to add
2022-03-18 23:50:00 -04:00
Pandora 4596f644c0 I used the shotgun. 2022-03-17 21:08:09 +00:00
GhostActual e27ab0c103 Base Commit 2022-03-12 01:05:30 -05:00
Casey 27b451a2c8 Merge pull request #12353 from GhostActual/Ammo_Boxes
Ammo Boxes
2022-03-03 16:22:34 -05:00
klaasjared 2a0507486f Whoops 2: Electric Boogaloo 2022-03-02 20:28:35 -05:00
PastelPrinceDan 5c3f31efcb fixes 2022-03-02 15:49:40 +00:00
klaasjared 18b3d72f37 Small changes 2022-03-01 18:57:45 -05:00
klaasjared 924f67767e Whoops 2022-03-01 01:28:44 -05:00
klaasjared e4ed93e11d Shotgun Ammo Boxes
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this

(Compile Fixes)
2022-03-01 01:27:54 -05:00
klaasjared dc2bc419c1 Secondary Commit 2022-02-28 22:17:03 -05:00
klaasjared 53a849f138 Projectile Organization
Puts loose projectile code where it goes - put in separate Commit in case Admins don't want this
2022-02-26 23:34:24 -05:00
klaasjared 98636f4e68 Laser Tag Revamp/Additions
Laser Tag Revamp/Additions 2
Laser Tag Revamp/Additions
Update toy.dm
2022-02-18 02:53:17 -05:00
klaasjared e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
Atermonera d930b94d34 Merge pull request #8385 from Atermonera/bb
Adds caseless BB rounds for common gun types
2022-01-27 23:09:41 -05:00
Heroman 12546cd5d6 More fixes/adjustments for BSH 2021-12-11 17:46:09 +10:00
VerySoft cf7d14b2ee You can't eat yourself, charlie brown!
Makes it so you can't eat yourself with the BSH
2021-12-08 13:18:42 -05:00
Heroman 76df8bf18b Post-testing fixes 2021-12-04 19:48:59 +10:00
Heroman 2e29a40ef7 Makes Bluespace Harpoon capable of televore 2021-12-04 15:51:40 +10:00
Casey c0e6cf8d71 Merge pull request #11831 from Hatterhat/rad-arm
operation RAD APES
2021-11-22 23:44:44 -05:00
Casey 9996cac6f6 Merge pull request #11903 from Heroman3003/offsitefix
Fixes offsite modulator
2021-11-22 23:38:35 -05:00
Heroman 771549d452 Fixes offsite modulator 2021-11-22 18:36:32 +10:00
Atermonera f3bdc71afb Merge pull request #8344 from Verkister/patch-80
Fixes rocket launcher
2021-11-21 03:04:41 -05:00
Casey dead3acae1 Merge pull request #11841 from FartMaster69420/somatoray
Somatoray Modularity
2021-11-20 05:46:43 -05:00
FartMaster69420 c9095b673d Cleaning code
Derp, left some unreachable code.
2021-11-19 17:34:10 -05:00
FartMaster69420 16bf6be95e Merge branch 'VOREStation:master' into somatoray 2021-11-19 17:00:21 -05:00
Hatterhat a4e998854d repaths i forgor 💀 2021-11-18 16:34:03 -06:00
FartMaster69420 83b77c7923 Adding comments 2021-11-16 16:39:54 -05:00
FartMaster69420 40f963ea22 Adds effects to upgrading the Somatoray
The chance of a mutation is now multiplied by the tier of laser used.
2021-11-16 16:28:59 -05:00
VerySoft 2516a17bd4 SD QOL update
Fixes a few map issues.
2021-11-16 01:40:24 -05:00
FartMaster69420 b0804eed80 Somatoray Buff, initial commit
This adds micro laser stock parts as a component to floral somatorays.
2021-11-16 01:24:30 -05:00
Hatterhat 9a4215fddb when the 2021-11-15 19:14:30 -06:00
Hatterhat 029379ec98 making the heater have a reason 2021-11-09 00:04:59 -06:00
Hatterhat 1760663ac0 i forgot to test the KA offsite check lol 2021-11-09 00:02:04 -06:00
Aronai Sieyes e5346a3920 Merge pull request #11675 from VOREStation/upstream-merge-8250
[MIRROR] Adds unique projectile hit messages to simplemobs
2021-10-27 21:06:41 -04:00
Cerebulon 5d86e5051c Adds unique projectile hit messages to simplemobs (#8250)
* Adds unique hit messages to simplemobs

* decl'd hit lists

* how was that even working

* set decl ref on init
2021-10-27 20:52:55 -04:00
Aronai Sieyes e1068faac0 Rebase 2021-10-27 20:37:02 -04:00
Casey 226802ff73 Merge pull request #11701 from Hatterhat/tg-ka
ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
2021-10-27 12:00:42 -04:00
Hatterhat 2655ef17c3 machete resize oops, KA heat modulator 2021-10-25 18:36:45 -05:00
Hatterhat b73457a199 makes KAs usable 2021-10-24 15:30:08 -05:00
MistakeNot4892 fbe933d8a1 Merge pull request #8328 from Atermonera/rockets_that_go_sideways_arent_REALLY_rockets
Rocket launchers make the projectile when they consume the rocket
2021-10-10 05:40:43 -04:00
Hatterhat bfac91465b Crusher Gaming (#11462)
* [the who - baba o'riley plays in the background]

* i need more POWER

* rewrite pt1

* bug fixo

* uh oh! they're obtainable!

* verbs

* knif

* furthur cleanup

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-08-22 15:18:12 -04:00
klaasjared 7601d77eb0 Base Commit 2021-08-21 02:30:39 -04:00