Commit Graph

3624 Commits

Author SHA1 Message Date
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
GhostActual
1ac8b601a6 Base Commit 2022-04-15 04:19:08 -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
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
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
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
Atermonera
f01d1afa72 Merge pull request #8432 from listerla/typos
somethign -> something
2022-03-20 15:09:39 -04:00
Pandora
fc00497706 oopsy doopsy 2022-03-16 16:40:06 +00: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
Pandora
ead95082d3 Atmos Tech QoL 2022-03-06 06:00:36 +00:00
Casey
27b451a2c8 Merge pull request #12353 from GhostActual/Ammo_Boxes
Ammo Boxes
2022-03-03 16:22:34 -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
Casey
339b501b10 Merge pull request #12321 from TheDavestDave/saber
A more elegant weapon from a more civlised age
2022-02-27 14:27:10 -05:00
TheDavestDave
165a00356d saber to longsword
changes name to longsword
2022-02-25 17:02:34 +00:00
TheDavestDave
bc57bedb5a change 2022-02-25 16:34:14 +00:00
TheDavestDave
98a0836af4 A more elegant weapon from a more civlised age
adds what is effectively a rebalanced sword.

instead of being in sword family it's in two handed, and allows some tricks.

Like most two handed weapons it gains a damage boost if wield. At 0.3 sharpness it will be as powerful as machete of similar material. Minus the cleave effect. If held with something in your other hand it does 0.1 sharpness, a third of the machete.

Also the parry ability ONLY works if wielded. So you can't use it with a shield or a second parry item. You can't even parry if you have a gun or pen in the other hand.

so pros
can parry

cons
needs an empty hand to parry
if used one handed is 1/3 as powerful as stock gear
starts out as steel and needs mats to upgrade
2022-02-25 14:41:27 +00:00
VerySoft
baae6f7309 Don't mess with minitest! >:C 2022-02-24 21:17:32 -05:00
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
Casey
1432ca2b22 Merge pull request #12253 from GhostActual/Donk-Co.-Toys
Donk Co. Toys
2022-02-18 23:26:48 -05:00
TheDavestDave
edbf41d089 Merge branch 'VOREStation:master' into primative-shield-2 2022-02-19 02:16:27 +00:00
VerySoft
f01b5b6ff3 Fix a runtime with capture crystals
You can't tell a mob with no client or AI holder to follow you.
2022-02-18 18:36:53 -05:00
klaasjared
e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
TheDavestDave
70c93bcaf0 I forgot the lorge again 2022-02-17 15:28:28 +00:00
TheDavestDave
6dcadd97c0 primative-shields
a primitive shield, perfect for the next knights at castle mystic event.

it's much less cool, there's no metal ones. but it's literally the only low tech shield in our code right.

No really all other shields are made of plastic like the riot shield, or energy like halo jackles.

anyway it has 10 lower block chance than the explo shield and 20 less than riot. It's planks off wood and a bucket tied together
2022-02-17 15:14:18 +00:00
VerySoft
4b50dff53a Uncapitalize curious crystal
that way it gets 'the' in front of it in messages.
2022-02-13 18:19:03 -05:00
Cerebulon
f2bc8d030f Cybernetic Augments and Sick Tats 2022-02-13 02:52:16 -05:00
Casey
7f210547c5 Merge pull request #12194 from ktccd0/ktccd-dev-Pouches-Fix
Fixes pouches
2022-02-11 17:19:38 -05:00
ktccd0
e17770e14a Fixes pouches
Fixes hardcoded delays, fixed incorrectly copy-pasted code for item-insertion.
2022-02-11 11:06:08 +01:00
TheDavestDave
89c1bf4bbc strapless bag
a bag without straps taking out the body spirte. A kit bash of other things but should work
2022-02-10 18:56:31 +00:00