Razgriz
9c5a4e3575
Merge pull request #185 from lbnesquik/Sledgehammer-Add
...
Add a craftable, two-handed sledgehammer.
2020-01-24 03:03:02 -07:00
lbnesquik
e0fcf47373
Add a craftable, two-handed sledgehammer.
...
- Can be made out of plasteel, rods and metal.
- Relatively high damage but less than the fireaxe.
- Special sound.
2020-01-21 13:48:28 +01:00
Aaron
ff9ec4943b
New Mech "Scarab"! Plus a bunch of mech fixes
...
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
2020-01-20 19:51:24 -05:00
Razgriz
3009bade9e
Remove sleeving cure
...
Removing resleeving sickness
2020-01-13 18:49:46 -07:00
Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
Hawk-v3
4623c3c1d1
Merge branch 'master' into master
2020-01-13 20:31:39 +00:00
Hawk_v3
6dcf1520b4
Let's get this wrapped up and ready to go.
...
Removed all KHI references, and the Vore AI Law stuff.
2020-01-13 19:38:10 +00:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Holdelta
6b83f6010e
Update RPD.dm
2020-01-12 00:35:04 -08:00
Holdelta
971926f195
Add files via upload
2020-01-11 23:29:43 -08:00
Sharkmare
f568be89d9
The cake, Serg event. ( #120 )
...
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
Heroman3003
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93
Adds a single cure pill to vault, doubles amount ERT gets, changes taste
2020-01-10 09:31:51 +10:00
Mechoid
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
Hawk_v3
838f5e9418
Merge remote-tracking branch 'upstream/master'
2020-01-06 00:47:53 +00:00
Heroman
e05fdf6258
Fixes clamp issues
2020-01-06 08:37:27 +10:00
Heroman
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
lbnesquik
377723bcf4
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-30 09:09:51 +01:00
Razgriz
9656b7c18a
Notification change for welderbombing
...
Instead of saying gaypwnd, it says you are doomed when welderbombing.
2019-12-29 14:25:49 -07:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Heroman
572112d28b
Fixes AI not being able to resist out of nets
2019-12-29 08:33:10 +10:00
Repede
2af9f4ee44
Merge branch 'master' into master
2019-12-26 20:40:10 -05:00
lbnesquik
562df07602
Move the lance sprite to weapons_vr.dmi.
2019-12-26 07:25:49 +01:00
lbnesquik
eace084579
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea
Introduce more taur clothes.
...
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Cerebulon
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
Shadow
c59e362fb5
Adds Change Tags
2019-12-22 21:14:09 -06:00
Shadow
d4e45ee3b1
Adds the Booze Borg
2019-12-22 20:02:36 -06:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Meghan-Rossi
ef7dfaa6cc
Resolve conflicts, fix compile errors
2019-12-19 18:44:47 +00:00
Shadow
0d8ab20599
A Slash!
2019-12-16 16:11:28 -06:00
Atermonera
ef75d1c2a0
Clean up dead code obsoleted by outfit system
2019-12-16 00:51:16 -05:00
Shadow
71b7b93c21
untested ™️
2019-12-15 17:06:43 -06:00
Unknown
f68a82b81f
Replaces lentext with length
2019-12-12 13:13:18 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Unknown
f42cd78de3
Fixes Elven Weapons
2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f
Attempts to fix Gladius
2019-12-06 18:59:35 -05:00
Unknown
d8392dfe8b
More updates
2019-12-06 18:24:18 -05:00
Unknown
5499e3272f
Miscellaneous fixes
...
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds
Fixes #6265
2019-12-06 17:10:13 -05:00
Anewbe
12d5118ecc
Merge pull request #6550 from listerla/grammar-time
...
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:49:14 -05:00
Mechoid
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
Hawk_v3
bafec81a0a
Merge Upstream
2019-11-22 23:40:13 +00:00
Unknown
a788cad3d9
Nerfs Chemistry Bag Toting
...
Chemistry bags can no longer be carried around in the belt slot, considering the number of chems they can carry they are probably a bit too large for that.
2019-11-17 15:55:19 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Meghan-Rossi
f8c214ea67
Fix box of service keys being called "box of command keys"
2019-11-12 08:55:43 +00:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
lolman360
31995aba35
Sharpening kits. ( #6501 )
...
* one
* rtwo
* image
* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
lolman360
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
