Commit Graph

5891 Commits

Author SHA1 Message Date
Foopwo
88df7b3993 Added donksoft gun and size gun upgrades for borgs 2022-05-14 19:41:26 -07:00
Casey
404ff6a052 Merge pull request #12897 from FartMaster69420/cocoon
Cocoon Metamorphosis
2022-05-12 15:21:13 -04:00
ItsSelis
d30a55e12a Allow numbers in pAI name 2022-05-09 20:18:43 +02:00
Killian
81abd2f6e3 chest targeting fixes 2022-05-08 23:28:12 +01:00
FartMaster69420
1c80b3de62 Merge branch 'master' into cocoon 2022-05-08 14:23:23 -04:00
Casey
e929fba143 Merge pull request #12925 from Heroman3003/selectable-items
Adds chemistry kits
2022-05-08 05:56:06 -04:00
Casey
2829d67967 Merge pull request #12888 from FartMaster69420/pai_and_bots
The pAI, Bot, and Microwave Tweaks
2022-05-08 05:46:05 -04:00
Casey
f3a453d50f Merge pull request #12881 from TankTheBirb/master
Pocket pouch rebalance + obtaining method
2022-05-08 05:43:51 -04:00
Heroman
329a6ac8d3 Adds chemistry kits 2022-05-08 09:22:55 +10:00
ItsSelis
6cfb25e9c5 Communication Updates
- Communicator Ringtones
- PDA Reply button on top & bottom
2022-05-05 02:10:42 +02:00
FartMaster69420
c270354fe7 Autoclose the panel
So people can't leave a cocoon and keep changing.
2022-05-04 14:18:57 -04:00
FartMaster69420
068709a116 Reworking procs
Making eject and insert pai procs machine agnostic, so any machine can be coded to support pAIs.
2022-05-02 12:14:30 -04:00
TankTheBirb
efb0d85f59 adjusted med pouch and added better notes
Med pouch now has 3 small item spaces instead of 4, keeps the fast draw because you can't move at all during it or it interrupts, cannot carry defibs, but can carry lollipops.  Medium and large are still better for packrats with less time sensitive operations.

Also added more //vorestation add things to the stuff I changed that weren't a part of pouches.dm.
2022-05-01 16:09:48 -04:00
TankTheBirb
a531e4e99e Pocket pouch rebalance + obtaining method
You know those pocket pouches you can find sometimes except you don't know where you can get them? Well you couldn't aside from map spawns. This fixes that, you can now make them using cloth, fur, or leather. Leather lets you make the really nice ones because its harder to get, cloth and fur let you make the smaller and specialized ones. Botany is your friend, Wabbacks let you grow cloth, teppi provide fur, and any animal can give you leather. There are also alternate ways to get these things too if botany is kill (unfortunate), but they're more time intensive than just asking the botanist.

Also I changed the contents to be somewhat more sane because the specialized pouches before were STUPIDLY restrictive and inferior in just about every way. So now there is a balance to it. Tools pouch is basically a belt for your pocket but half size. Supplies can carry actually useful supplies. Parts can carry the most of any pouch but literally only stock parts. Medical can draw stuff faster from their pouch and it can carry more medical related supplies than it could before. Ammo lets you carry grenades and plastique explosives now. Baton pouch is now the melee pouch and can fit more than just batons in it (still only one of them tho).
2022-05-01 12:58:59 -04:00
FartMaster69420
452f71dc5d Fixing bug
Moving checks from a single line into a proc and added a check to prevent zero sheet stacks from merging.
2022-04-28 22:55:25 -04:00
Casey
bb172b1b12 Merge pull request #12837 from GhostActual/stock_market
Stonks!
2022-04-26 17:23:01 -04:00
Casey
3fa5311a7c Merge pull request #12568 from Rykka-Stormheart/shep-dev-scanner-fixy
Fixes the Xenochimera Details not being their own line
2022-04-26 16:46:02 -04:00
GhostActual
ce4bec434e Secondary Commit 2022-04-25 22:02:26 -04:00
Casey
e5324f9aa9 Merge pull request #12768 from GhostActual/pocky_stick_fix
Pocky Fix
2022-04-17 17:16:50 -04:00
GhostActual
5dcea6ff9d Base Commit 2022-04-17 13:31:31 -04:00
GhostActual
2892390cb3 Base Commit 2022-04-17 13:15:30 -04:00
Casey
6a2e26314e Merge pull request #12739 from GhostActual/late_at_night
Late Night Stuff
2022-04-17 05:20:17 -04:00
GhostActual
1ac8b601a6 Base Commit 2022-04-15 04:19:08 -04:00
FartMaster69420
d7abb2e81e Fixing issues
Adds a check for stacktype and a turf check, preventing bad behavior.
2022-04-14 00:01:59 -04:00
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
9ea925d206 Fixes the Xenochimera Details not being their own line 2022-03-31 02:09:00 -06: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