Repede and GitHub
517d74928b
Merge branch 'master' into kk-miscstuff
2020-04-10 16:59:07 -04:00
MrSign
03005ad3d8
Update loadout_fluffitems_vr.dm
2020-04-08 14:33:30 +10:00
MrSign
2ab6a85f22
Update loadout_fluffitems_vr.dm
2020-04-08 12:21:32 +10:00
Unknown
0a58e60c87
Adds Everyone Else
2020-04-05 00:53:10 -04:00
Unknown
6c01ab5b8f
Adds Ascian's Medals
...
- Adds a Medal of Unity with two bronze stars for Ascian. Has its own sprite.
- Adds Ascian's Medal of Valor to loadout
- Refactors collars to be part of tie_vr in expected places.
2020-04-05 00:41:05 -04:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Heroman
1ae1900cd3
Fixes a random v
2020-04-03 10:13:23 +10:00
Heroman
7e3019971d
Fixes identetions
2020-04-03 10:08:49 +10:00
Heroman
525bbb5650
Gives slots to most fluff items
2020-04-03 09:01:39 +10:00
Heroman
91291fb6b2
Makes cloth footwraps colorable in loadout
2020-04-02 09:34:31 +10:00
Repede and GitHub
73ec83c76f
Merge branch 'master' into kk-miscstuff
2020-03-28 00:15:57 -04:00
SplinterGP
9dd21ddbae
Aroozee valhollide ring
...
Fluff item
2020-03-27 20:27:43 -03:00
TheFurryFeline
94ddb5eb13
Vakashi's Permit Expiration
...
Expired permit removal, code cleanup.
Changlog Notes:
- Removes Vakashi's Permit and allowed item.
- Also removes code for Ace's long expired permit and the same for the commented out items.
2020-03-26 20:50:26 -04:00
Atermonera and VirgoBot
027028b314
Repaths collapsible white canes to not anger beepsky
2020-03-25 16:39:18 -04:00
Razgriz and GitHub
3a3759f2f1
Update loadout_fluffitems_ch.dm
2020-03-23 15:37:37 -07:00
Razgriz and GitHub
6fd126a7e9
Update loadout_fluffitems_ch.dm
2020-03-23 15:21:41 -07:00
EllyBrown and GitHub
b6d893db49
Changes to the custom item. ( #6929 )
...
* Add files via upload
* Update custom_clothes_vr.dm
* Update loadout_fluffitems_vr.dm
* Update custom_clothes_vr.dm
* Update custom_clothes_vr.dm
* Update loadout_fluffitems_vr.dm
* Update loadout_fluffitems_vr.dm
* Update custom_clothes_vr.dm
* Update custom_clothes_vr.dm
2020-03-21 00:55:55 -04:00
Razgriz and GitHub
7ae8129731
Nullsuits
2020-03-20 20:31:17 -07:00
Killian
8d2ec5f7fa
loadout comments, improved warden/hos access modification
2020-03-17 15:44:23 +00:00
Killian
8b9f5e949a
security pilot basics
2020-03-17 15:11:28 +00:00
Razgriz and GitHub
9b922161e6
egg
2020-03-13 00:43:29 -07:00
Meghan-Rossi
f7eabadf22
fluff items
...
*Adds Medal of Valor for Brynhild Vandradottir - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1688
*Adds Medal of Valor for Lilith Vespers - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1690
*Adds Vox scrap armor for Yikatihaki - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1662
*Adds silver pocket watch for Cappy Fuzzlyfeathers - approve in https://forum.vore-station.net/viewtopic.php?f=27&t=1651
*Adds green sweater vest for Zaku Fyodorovna - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1674
2020-03-12 17:42:19 +00:00
Repede
6e293183ad
Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate
...
# Conflicts:
# icons/mob/hud.dmi
2020-03-04 08:17:38 -05:00
Atermonera and VirgoBot
882aeee371
Merge pull request #6772 from Heroman3003/teshfix
...
Fixes a teshari mining undercoat
2020-03-03 01:38:13 -05:00
Repede and GitHub
03af76bd29
Merge branch 'master' into releaseupdate
2020-03-02 19:40:13 -05:00
SplinterGP
51b67068ff
Fixes oof on commit, path was missing
2020-03-02 21:00:48 -03:00
SplinterGP
42c3d5305f
Adds uniforms to loadout, forgot on last commit
2020-03-02 20:31:48 -03:00
SplinterGP
c65432d1c9
Adds fancy victorian vests, dresses and coats.
2020-03-02 20:27:39 -03:00
Hawk_v3
f2b8f92b63
Merge remote-tracking branch 'upstream/master' into releaseupdate
2020-03-02 17:55:11 +00:00
Wickedtemp and GitHub
40e2518633
Update loadout_fluffitems_vr.dm
2020-03-01 21:48:12 -06:00
Repede
c45d7c2196
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/modules/events/event_container_vr.dm
# icons/misc/title_vr.dmi
# interface/skin.dmf
# vorestation.dme
2020-03-01 12:35:52 -05:00
Novacat and GitHub
1602627443
Merge pull request #6643 from VOREStation/aro-detect
...
Add alternative detective wear
2020-03-01 10:54:03 -05:00
Heroman
b45f37b7c8
Adds Pip's Cloak
2020-03-01 12:32:31 +10:00
Shadow
b316782762
The implantening
2020-02-28 18:42:49 -06:00
Novacat and GitHub
7821dcd2bc
Merge pull request #6603 from Meghan-Rossi/fluffstuff
...
Fluff item
2020-02-25 10:48:57 -05:00
Leshana
a5af2759e3
Fix Runtime in loadout.dm,277: bad index
...
Runtime happens when someone has a saved preferences loadout containing an item that currently is expected to have gear_tweaks, but at the time that the savefile was last saved, did *not* have gear tweaks. Thus the saved prefs have null metadata.
Also it makes no sense to check the length of a list *inside* a for loop iterating over that list..
TODO - Figure out if its okay to spawn it without the metadata.
2020-02-23 22:03:21 -05:00
Luke Vale and Hawk_v3
f09c5dd6ed
Updates the Collar for the name change and some lore updates.
2020-02-23 20:57:21 +00:00
Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Repede
7fc70caa43
Resetting master
2020-02-22 12:28:01 -05:00
Aronai Sieyes
2a53830fa7
Add alternative detective wear
2020-02-21 13:46:49 -05:00
TheFurryFeline and GitHub
fadaf32cbb
Better Double Check
...
Taaa's got 3 medals, so making sure they will all show up as different names.
2020-02-20 23:20:55 -05:00
Killian
d7f156ac13
fashion attack 2: jackets
2020-02-19 22:45:01 +00:00
TheFurryFeline
e7c710cac5
The Hype of Medals Fixed
...
Medals are fixed now. If you have a medal on the list here, you'll be able to select it in the loadout. I've also taken the liberty to just nix the medals subtype for now. Unneeded spaghetti. Blep.
Changelog notes:
- Fixes modals not being selectable in loadout even with your name and ckey being correct.
2020-02-19 17:00:06 -05:00
Greenjoe12345 and VirgoBot
3391de2f42
canes and crutches ( #6694 )
...
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup
* fixed a spelling error
2020-02-19 14:34:41 -05:00
Heroman3003 and VirgoBot
07a73c7f23
Lowers cost of ponchos and cloaks in loadout ( #6705 )
2020-02-19 01:24:51 -05:00
Repede
1950b800d0
Rin Deimos fluff item, just a crystal that does nothing.
2020-02-18 19:33:17 -05:00
Meghan-Rossi
b9abe73b7c
Fluff item
...
*Adds custom latex clothing for Excess - Approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
2020-02-18 23:39:15 +00:00
Meghan-Rossi
dfc42293c7
Fluff items and species whitelisting
...
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
2020-02-18 00:27:36 +00:00
Killian
891761e96a
quickfix
2020-02-17 21:49:36 +00:00
Killian and GitHub
72acdd2dac
Merge branch 'master' into kk-traffic
2020-02-17 17:35:47 +00:00
