Commit Graph

5866 Commits

Author SHA1 Message Date
Casey 4114fd68e2 Merge pull request #12715 from Very-Soft/capturecrystalfix
Allow capture crystals without owners to obtain owners
2022-04-11 15:26:42 -04:00
VerySoft abbc699e38 Allow capture crystals without owners to obtain owners
Wow! Fixes https://github.com/VOREStation/VOREStation/issues/12699
2022-04-10 21:14:55 -04:00
FartMaster69420 d220b9b73d Near final 2022-04-09 22:26:03 -04:00
FartMaster69420 f7d3111f2a Portable Grinder and Bag 2022-04-09 18:01:11 -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 f121f7fa1a Final
Removing debug stuff and disabling minitest
2022-04-06 21:26:45 -04:00
FartMaster69420 8fa89518ba Cleanup 2022-04-06 21:01:13 -04:00
FartMaster69420 0f71072173 Stacking Stacks 2022-04-06 20:40:08 -04:00
GhostActual e2f1ddd3f1 Base Commit 2022-04-06 03:08:04 -04:00
Casey 592c8441de Merge pull request #12662 from GhostActual/donk-pockets
New Donk-pockets
2022-04-05 22:11:48 -04:00
GhostActual 99eaf5f21b Base Commit
Secondary Commit
Third Commit
2022-04-05 21:39:23 -04:00
GhostActual 7e4e7d8aeb Secondary Commit 2022-04-05 18:30:17 -04:00
klaasjared bcb6a6c756 Base Commit 2022-04-05 16:40:37 -04:00
VerySoft 99a2df9dee Various fixes and more GB tweaks 2022-04-04 14:55:58 -04:00
Casey 5d24d5b2c3 Merge pull request #12631 from GhostActual/aurora-port-1
Mini Aurora Port
2022-04-04 04:40:50 -04:00
VerySoft 40379d01d8 I did it 2022-04-04 03:36:08 -04:00
GhostActual fac05cdd40 Base Commit 2022-04-04 02:10:25 -04:00
Casey 5d9f0462c1 Merge pull request #12579 from GhostActual/tg-port-5
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
Casey 086173c328 Merge pull request #12576 from GhostActual/tg-port-2
The Grand /TG Port - Part 2
2022-04-02 23:26:31 -04:00
GhostActual 81c603f9d5 Base Commit 2022-04-02 22:54:14 -04:00
GhostActual ef2ef019cb Base Commit 2022-04-01 03:33:58 -04:00
GhostActual b268b7bcfa Base Commit 2022-04-01 01:03:30 -04:00
Rykka 6e3d0f7238 Removes pain on defib for everyone, and removes xenochimera lick wounds
Pending re-addition later for Xenochimera-specific implementation.
2022-03-27 18:59:22 -06:00
Rykka d4fb27da6f Xenochimera QOL PR
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.
Defibrillators will now apply halloss (pain) to everyone 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.
Lick Wounds has been modified to allow treating self-injuries, and injuries of the mob next to you. Given how limited the use is and how often bandages + chems are just flat-out better, this shouldn't be a huge balance issue, IMO.
2022-03-27 16:22:46 -06:00
Casey 8182a57fea Merge pull request #12545 from BonniePandora/unfucks-engraving
Makes engraving no-longer cause rage when trying to cut wires, amongst other things.
2022-03-27 14:59:24 -04:00
Heroman 56849e7a71 Reworks xenobio extract rewards 2022-03-27 14:17:41 +10:00
Pandora bb60734833 Update knives.dm 2022-03-26 16:52:16 +00:00
Pandora ddd3137592 Update wirecutters.dm 2022-03-26 16:51:40 +00:00
Pandora 3b04c3893f Update screwdriver.dm 2022-03-26 16:47:26 +00:00
Casey cce944d043 Merge pull request #12522 from GhostActual/Firearms1
Firearms 1
2022-03-25 23:55:54 -04:00
GhostActual 7dced2cc17 Base Commit 2022-03-24 16:35:34 -04:00
Eli Atonis 9ec106f06f Allowing micros to crawl into storage items
Fixed a bug where a micro player could pick themselves up out of storage items if they used alt+click to open it. This would free them, but create an invisible, empty holder item in their hands which could then be placed in storages.

Added the ability for micros (size 25%) and observer mice (size 100% or lower) to drag their sprite over storage items in order to climb inside. Same as if a player were to pick them up and store them.
2022-03-24 19:31:07 +11:00
VerySoft 80ab673771 Admin Verbs
Adjusts Intercom Msg a little

Adds Orbit Things verb, which allows staff to more easily orbit things around other things.
2022-03-23 01:36:04 -04:00
GhostActual 96d2da15a3 Base Commit
Update shotgun.dm

Final Commit?

Final
2022-03-21 05:02:08 -04:00
Atermonera f01d1afa72 Merge pull request #8432 from listerla/typos
somethign -> something
2022-03-20 15:09:39 -04:00
GhostActual 3c10cc1aee Base Commit 2022-03-20 00:03: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
Casey 8ee0c8c873 Merge pull request #12449 from BonniePandora/Warden's-delight
Adds a choice between shotguns available to wardens.
2022-03-18 15:33:54 -04:00
Pandora ddf216335c You know why? 2022-03-17 21:12:00 +00:00
Pandora fc00497706 oopsy doopsy 2022-03-16 16:40:06 +00:00
Casey 2427db9b84 Merge pull request #12420 from FartMaster69420/borg-upgrades
More Upgrade Modules for Borgs
2022-03-12 15:44:14 -05:00
Verkister 18a3780e74 Fixes zaddat lunchbox adding extra hypos on all SB
Fixes zaddat survival lunchbox adding extra glucose hypos on all survival lunchboxes, or more specifically just overriding the loadout survival lunchbox.
2022-03-12 12:12:32 +02:00
FartMaster69420 c4d09997f7 Printable modules
Making the modules printable
2022-03-11 20:39:56 -05:00
FartMaster69420 f139c8369d Update robot_upgrades.dm 2022-03-11 17:26:37 -05:00
FartMaster69420 c195eba49a Update robot_upgrades.dm 2022-03-11 16:29:32 -05:00
FartMaster69420 35bded46c2 Merge branch 'VOREStation:master' into borg-upgrades 2022-03-11 16:23:30 -05:00
Pandora ead95082d3 Atmos Tech QoL 2022-03-06 06:00:36 +00:00
FartMaster69420 c3d2a3591f Borg Stuff 2022-03-05 12:22:03 -05:00
Casey 27b451a2c8 Merge pull request #12353 from GhostActual/Ammo_Boxes
Ammo Boxes
2022-03-03 16:22:34 -05:00