Commit Graph

246 Commits

Author SHA1 Message Date
ItsSelis
af64bcf406 More Input Conversion 2022-06-19 12:21:51 +02:00
GhostActual
1ac8b601a6 Base Commit 2022-04-15 04:19:08 -04:00
Pandora
bb60734833 Update knives.dm 2022-03-26 16:52:16 +00: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
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
MistakeNot4892
0cea9c35a6 Remove suicide act 2021-10-27 20:35:12 -04:00
MistakeNot4892
a8b6476b8f Allows wiping food off cutlery 2021-08-30 20:07:29 -04:00
Aronai Sieyes
7994cd6eb3 Bad fix WIP 2021-08-26 12:07:53 -04:00
Aronai Sieyes
e5c108269d Merge pull request #11454 from VOREStation/Arokha/stacks
Make stack amount var private
2021-08-26 11:38:33 -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
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
VerySoft
e1ec5445e9 Stone bone axe fixxy
It uses the wrong sprite!
2021-08-16 18:04:48 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
MarinaGryphon
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
MarinaGryphon
93a93b1885 Fixes #10885 2021-07-08 23:27:54 -05:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes
ab18ddd712 Bay stuff instead 2021-07-01 17:36:24 -04:00
Atermonera
f859e9ba8c Merge pull request #8158 from Novacat/nova-oreprocessor
Halves Item Slowdown Effects
2021-06-28 01:53:10 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
Novacat
4e0cba3b80 Update kitchen.dm 2021-06-19 09:22:31 -04:00
MarinaGryphon
7ee772f6e7 Refactors utensils to use weakrefs 2021-06-18 19:02:33 -04:00
Aronai Sieyes
1696db4842 Move most/all overlay use to SSoverlays
Except for the ones I'm about to change in the
lighting commits!
2021-06-17 00:11:13 -04:00
TheDavestDave
c88c88fe2c stops armour plate and armour plate inserts having the same name, and examine text as each other (#8123)
armour plate and armour plate inserts have the same sprite, name, and examine text in game. I can fix two of  three things. You need to do stuff with amour plate inserts to make it fit in a plate carrier wile amour plate just will never fit
2021-06-11 01:11:21 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Atermonera
8d4801b827 Ported the Bay/Nebula emote system. 2021-05-05 12:28:25 -04:00
MistakeNot4892
37717fe7b2 Tachikoma tweaks. (#7988)
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
FenodyreeAv
efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown
e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Aronai Sieyes
eee1ce7c04 Don't call attack_self programatically on this 2021-02-17 09:57:31 -05:00
Mechoid
02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Mechoid
40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
Novacat
612f187ef6 Update twohanded.dm 2020-11-19 19:45:26 -05:00
Mechoid
a62f766bb5 Kaleidoscope 2: The Retabbening 2020-11-19 13:06:10 -05:00
Meghan-Rossi
3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726)
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 06:06:15 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands
[Feature Tweak] Message Fixy For Snowballs/Kickstands
2020-03-25 18:47:34 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00