Commit Graph

431 Commits

Author SHA1 Message Date
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Heroman
7088a5e6cc Fixes Roiz Lizden's and Chakat Taiga's fluff items 2019-09-16 04:51:12 +10:00
Heroman
6e06dd8f32 Fixes 2019-09-15 12:29:21 +10:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Novacat
963436e8a3 Update loadout_fluffitems_vr.dm 2019-09-13 20:17:21 -04:00
Novacat
4dbf311e51 Deletes Aronai's all access ID 2019-09-13 20:00:37 -04:00
Mewchild
111d437e24 Fixes 2019-09-13 13:22:46 -05:00
Mewchild
fbc5503bd7 Lower cases ckeys, approves Tachika's medal 2019-09-12 01:30:26 -05:00
Novacat
0e6ba773be Update loadout.dm 2019-09-11 22:09:10 -04:00
Unknown
d35f65ca6c Fixes PR 2019-09-11 22:05:30 -04:00
Mewchild
9d5a07e352 VS, Not Cit. 2019-09-11 14:29:34 -05:00
Mewchild
e142e858e6 Reworks things. Closer to intended functionality. Adds paths to all items, restrictions. 2019-09-11 02:45:55 -05:00
Mewchild
fa73501fab field medic, uncomments lucia's battery 2019-09-10 16:30:27 -05:00
Mewchild
a40a656478 Restricts items, removes a medal, enables character check 2019-09-10 16:21:12 -05:00
Mewchild
abfe5b797a Requested changes. Removes most commented items 2019-09-10 15:29:36 -05:00
Mewchild
e77a66dcc3 Refactors Fluff Items, moves them to be loadout options 2019-09-10 04:59:10 -05:00
Hawk_v3
fc97b8233b Merge remote-tracking branch 'upstream/master' 2019-09-08 18:55:37 +01:00
Cyantime
b751e0e8bd Updates paths due to Polaris change 2019-09-01 18:24:35 -04:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Heroman
fe8fa41688 Unrestricts medical and research cloaks 2019-08-31 13:23:53 +10:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
TheFurryFeline
23b3450404 Descriptive Role Restriction on Accessories
Show what roles are allowed for webbing vests and drop pouches aside from the white variations.
2019-08-18 12:34:48 -04:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Unknown
1cd0ee6daf Purges bad indentation 2019-08-10 04:06:08 -04:00
Unknown
0afd758767 Adds pilot qualification pin to loadout
Currently only allows job roles with pilot access to take it.
2019-08-10 04:01:51 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Atermonera
de27063ae1 Merge pull request #6334 from Schnayy/clothingpack1
New Clothing & Sweaters
2019-07-27 15:09:11 -04:00
Dwaggy
58ed8788de - Adds fluff item for Saur: Plate Carrier and relevant attachments
- added this to the starter box for Saur.

Re-adds Blueshield guard to be able to select holsters and drop pouches that are ment for security divisions too.
2019-07-11 04:27:24 +01:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Novacat
d32641e940 Merge pull request #5367 from Novacat/nova-basicfixes
Enables Language Implants
2019-07-04 21:08:10 -04:00
Heroman
2c11586f7d Fixes some personal fluff items being selectable in loadout 2019-07-05 09:58:27 +10:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Unknown
9b4ad70da6 Enables Language Implants
On request from Dragor.

Removes the VOREStation edits commenting out EAL/Skrellian language implants.
2019-06-24 21:39:23 -04:00
TheFurryFeline
d94e166347 Indigestible Collar
Adds a new loadout item, a variation of the holo-collar with the intention of surviving digestion of its wearer. Approved, pretty much, from https://forum.vore-station.net/viewtopic.php?f=26&t=1531&sid=d3664ec3c397cebbf9a62e2e18fbb6f6
2019-06-17 11:43:56 -04:00
Hawk_v3
9b0186a2c1 Merge remote-tracking branch 'upstream/master' 2019-05-09 23:11:58 +01:00
Novacat
8dd3039217 Update loadout_utility.dm 2019-05-09 13:43:15 -04:00
Atermonera
445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Novacat
797f9dee59 Merge pull request #5115 from InterroLouis/Webbing-Cost
Changes Webbing Cost
2019-04-28 22:57:41 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
InterroLouis
7d63917579 Update loadout_accessories_vr.dm 2019-04-21 17:28:22 -04:00
InterroLouis
4fe127b83a Update loadout_accessories_vr.dm 2019-04-21 15:47:01 -04:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Jonathon Key
346725f28b Adds a colorable cloak in loadout (#6040) 2019-04-13 17:38:00 -04:00
Heroman3003
e0e9158739 Loadout adjustments for access and swimsuits 2019-04-08 10:19:21 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
2019-04-07 19:40:12 -04:00
mistyLuminescence
26ead98d6f Loadout item role tweaks (#5998)
* Loadout ItemRoles tweak
2019-03-30 04:10:16 -04:00
Novacat
ca660879fd Merge pull request #4862 from Novacat/nova-pathfinder
Ports veils from Baystation
2019-03-28 22:12:53 -04:00
Novacat
e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992
[MIRROR] Departmental Turtlenecks
2019-03-28 22:00:31 -04:00