3c06d62345
Update weldingtool.dm
2020-03-08 03:25:18 -04:00
acc712e1d5
Exosuit Expansion: Return of the Ripley
2020-03-08 00:52:32 -05:00
6e23c5f45a
Merge pull request #6709 from VOREStation/aro-mistake
...
Fix way too many vorestation edits
2020-03-05 19:03:58 -05:00
b44f8e0911
Merge pull request #6592 from VOREStation/vchat-rebase
...
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
f475ecbdc6
Replace a bunch of VOREStation edits that can be sent to Polaris
2020-02-29 19:45:58 -05:00
c63ba4a349
Nerfs Chameleon Kit Boxes ( #6763 )
...
* Nerfs Chameleon Kit Boxes
Because of the way chameleon kits start with items, the boxes start with a ton of storage slots to hold all the items. Sometimes people grab the boxes, dump out the original contents and stuff a ton of stuff into them as a result.
This refactors it so that all the chameleon stuff starts in the backpack instead, so chameleon kit boxes themselves are no longer superboxes
* Unnecessary comma
2020-02-29 18:02:21 -05:00
650007f9e7
Merge pull request #6672 from VOREStation/upstream-merge-6729
...
[MIRROR] Fix and tweak station Railguns.
2020-02-24 20:26:32 -05:00
55704e0760
Merge pull request #6729 from Mechoid/RailgunFixxo
...
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
16183867df
Adds holster, lighter, and seatbelt sounds from World Server.
2020-02-24 16:12:37 -05:00
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
1010fd283b
Merge pull request #6690 from VOREStation/vplk-ntnet-fixer
...
Fixes to Modular Computers and NTNet Relays
2020-02-21 01:58:20 -05:00
1d9e5be122
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
b5f337a3b0
Replaces Tramadol maint pills with Paracetamol
2020-02-16 10:54:55 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
6374108fa2
Applies same restrictions as first aid to external synth repair
2020-02-10 18:53:31 -05:00
7b20362aaf
Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change
...
Stunbatons will now only harmbaton on grab/harm intents
2020-02-09 14:47:00 -05:00
908489b1bd
Merge pull request #6640 from TheFurryFeline/patch-5
...
Aaaa, typo fixy
2020-01-21 18:14:22 -05:00
1688d86772
Merge pull request #6478 from VOREStation/upstream-merge-6621
...
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
d10a72a77f
Adds a mega cooking recipe
2020-01-20 23:15:01 -05:00
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
7ae5204eaf
Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
...
Can now (de)construct chem masters
2020-01-15 23:16:19 -05:00
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
a9c1f48a93
Adds a single cure pill to vault, doubles amount ERT gets, changes taste
2020-01-10 09:31:51 +10:00
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
e05fdf6258
Fixes clamp issues
2020-01-06 08:37:27 +10:00
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
377723bcf4
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-30 09:09:51 +01:00
572112d28b
Fixes AI not being able to resist out of nets
2019-12-29 08:33:10 +10:00
562df07602
Move the lance sprite to weapons_vr.dmi.
2019-12-26 07:25:49 +01:00
eace084579
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes
2019-12-26 07:25:05 +01:00
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
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
ef7dfaa6cc
Resolve conflicts, fix compile errors
2019-12-19 18:44:47 +00:00
ef75d1c2a0
Clean up dead code obsoleted by outfit system
2019-12-16 00:51:16 -05:00
f68a82b81f
Replaces lentext with length
2019-12-12 13:13:18 -05:00
f42cd78de3
Fixes Elven Weapons
2019-12-06 19:14:35 -05:00
192dd12e7f
Attempts to fix Gladius
2019-12-06 18:59:35 -05:00
d8392dfe8b
More updates
2019-12-06 18:24:18 -05:00
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
12d5118ecc
Merge pull request #6550 from listerla/grammar-time
...
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:49:14 -05:00
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
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
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
f8c214ea67
Fix box of service keys being called "box of command keys"
2019-11-12 08:55:43 +00:00
31995aba35
Sharpening kits. ( #6501 )
...
* one
* rtwo
* image
* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
d7c0195212
Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
...
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
6385a2f662
ERT Rangers Costumes ( #6493 )
...
* Sprites
* and code fuckit
2019-10-25 15:07:49 -04:00
173fd85764
Merge pull request #6086 from Verkister/werespecies
...
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Novacat