Commit Graph

3607 Commits

Author SHA1 Message Date
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
VerySoft
4d9af38a9b One last one! 2022-02-09 19:00:46 -05:00
PastelPrinceDan
ad7a96bfa3 talon mining 2022-02-06 22:51:28 +00:00
VerySoft
31afcf3869 Item Bank fixy!
I should be asleep
2022-02-06 10:29:59 -05:00
Heroman
4ab7516c16 Makes pocky not leave behind trash gum 2022-01-16 16:20:31 +10:00
PastelPrinceDan
7657901241 okay let's hope this works now 2021-12-22 15:11:09 +00:00
Hatterhat
92cff738e7 hhhhhhhinducer 2021-12-15 23:42:33 -06:00
VerySoft
8a8c25184b Makes your balls better
Capture crystals 'Command' function now allows the standard maximum text input (4096) (and warns you, and reflects your message back at you if you go over that limit)
2021-12-11 08:45:24 -05:00
VerySoft
f7b880e609 Another capture crystal tweak
You can now destroy the crystal to release whatever is inside of it.

You can now relinquish ownership ownership (without releasing the mob)

You can now toggle ghost join on and off on AI controlled mobs who have been caught by the capture crystal, rather than it being automatically on. (Once a ghost joins, it cannot be turned on again, of course)

And generally cleans up some of the interactions.
2021-12-04 07:17:40 -05:00
VerySoft
dd5dc79260 Tweak capture crystal
Adds the ability for the owner to destroy the crystal (for releasing the bound mob)

adds admin logs to commands given through the capture crystal
2021-12-03 22:46:11 -05:00
VerySoft
2bf704a741 Is it the final one??? 2021-12-02 04:05:53 -05:00
VerySoft
7faaf6185b Let's goooo! 2021-12-02 01:47:33 -05:00
VerySoft
d2e0ebe9d6 One more for awooing 2021-12-01 11:10:44 -05:00
VerySoft
41dd79389f Finish these up 2021-11-30 18:52:31 -05:00
VerySoft
eb79345233 a few more things 2021-11-29 21:19:32 -05:00
VerySoft
d6bf641205 Updoot 2021-11-28 21:30:27 -05:00
VerySoft
5b1efccdb5 Offmap Tweaks
Just some neat offmap stuff~
2021-11-27 06:25:03 -05:00
Casey
a1e46a8afd Merge pull request #11881 from Heroman3003/grenadefix2
Fixes infinite detonators being attachable to grenades
2021-11-22 23:22:46 -05:00