Repede
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
Aronai Sieyes
ef32afa133
Merge pull request #7083 from VOREStation/vplk-pointdefense
...
Port Point Defense Batteries
2020-04-02 10:53:29 -04:00
Aronai Sieyes
bedcdd8d0c
Merge pull request #7082 from Heroman3003/colorwraps
...
Makes cloth footwraps colorable in loadout
2020-04-02 10:52:58 -04:00
Leshana
23482e88fa
Moves topic return value defines to where they are usable everywhere.
2020-04-01 20:36:00 -04:00
Heroman
91291fb6b2
Makes cloth footwraps colorable in loadout
2020-04-02 09:34:31 +10:00
Aronai Sieyes
301b5eb467
Allow wings with a secondary color
...
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
2020-03-31 22:40:48 -04:00
Repede
73ec83c76f
Merge branch 'master' into kk-miscstuff
2020-03-28 00:15:57 -04:00
Repede
515c9ac9d7
Merge branch 'master' into TFF-Mute_Thy_Merpage
2020-03-27 22:13:11 -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
TheFurryFeline
bafc26e80f
[Earlyport] Mutable Emotes
...
Ports https://github.com/VOREStation/VOREStation/pull/7005 early.
Changelog Notes:
- Allows muting of any audible emotes such as merps, squishes, and so on.
2020-03-26 14:39:11 -04:00
Aronai Sieyes
556ef6acc8
Emote noise toggle
2020-03-26 11:43:26 -04:00
Atermonera
027028b314
Repaths collapsible white canes to not anger beepsky
2020-03-25 16:39:18 -04:00
EllyBrown
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
Unknown
ac2e5b8d03
Fixes Occupation Screen
2020-03-17 15:28:40 -04: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
Novacat
194c9f7a63
Merge pull request #6841 from VOREStation/upstream-merge-6818
...
[MIRROR] Fully Implements R_EVENT for Event Managers
2020-03-15 17:01:36 -04:00
Aronai Sieyes
9bbfd211a3
Vorestation edit fixes
2020-03-15 15:17:27 -04:00
Novacat
176cf4f5ca
Merge pull request #6874 from VOREStation/upstream-merge-6804
...
[MIRROR] Big Bastard Incidental Sound Port
2020-03-15 15:14:39 -04:00
Novacat
557ed2e43e
Update occupation.dm
2020-03-15 14:40:44 -04:00
Atermonera
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Atermonera
3ac5a32e39
Fixes the occupation screen.
2020-03-15 14:35:59 -04:00
Atermonera
cb8548f5af
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -04: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
Atermonera
fa8c9fabab
Job description alt
2020-03-11 15:55:05 -04:00
SplinterGP
55a8639c67
Fix to other species being able to wingdings
2020-03-06 14:45:53 -03:00
SplinterGP
7e20d0a63f
Fixes a <b> that should not be there
2020-03-05 23:14:03 -03:00
SplinterGP
bc690976cd
Adds YW comments
2020-03-05 22:55:28 -03:00
SplinterGP
7c493f73f6
Adds grey speech problem
...
adds a speech problem that causes grey speak to be completely messed.
2020-03-05 22:24:22 -03: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
Neerti
0d9345adde
Half-Refactors Jobs
2020-03-03 16:28:33 -05:00
Atermonera
882aeee371
Merge pull request #6772 from Heroman3003/teshfix
...
Fixes a teshari mining undercoat
2020-03-03 01:38:13 -05:00
Repede
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
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
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
