Aronai Sieyes and GitHub
b98f849c82
Merge pull request #7723 from VOREStation/aro-playtimedept
...
Add department playtime requirement config, code
2020-05-10 19:00:38 -04:00
Unknown
a74d890331
Repurposes Explorer Corp Uniforms
...
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
2020-05-10 14:44:15 -04:00
Novacat and GitHub
1d9879c7a0
Merge pull request #7734 from KillianKirilenko/kk-misc
...
[LOADOUT] Dept. AR Glasses
2020-05-10 12:42:35 -04:00
Killian
f18191da1e
Update loadout_eyes_vr.dm
2020-05-09 17:33:38 +01:00
Aronai Sieyes
ea8a068025
Add department playtime requirement config, code
2020-05-08 17:57:56 -04:00
Aronai Sieyes
d172e2dd04
Cached version of icon_states() proc
2020-05-06 16:06:44 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
SplinterGP and GitHub
17df0f666f
Merge branch 'master' into master
2020-05-05 21:02:46 -03:00
SplinterGP
6b1cb4e1ff
Adds haemophilia too and reset button
2020-05-05 20:53:41 -03:00
SplinterGP
3ad4e4a535
Disabilities out of trait system
2020-05-05 15:46:30 -03:00
Aronai Sieyes
01a51e5acd
Add prefs for Be Morph, Be Maintpred, Be Lost Drone
...
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b
Fix out-of-order role candidate options
...
fixup pol commit
2020-05-04 20:04:43 -04:00
Killian and GitHub
8240a97400
Merge branch 'master' into kk-miscstuff
2020-05-04 14:20:02 +01:00
Steven Storesund
868d412d19
Aurora's floof, I mean fluff item
2020-05-03 19:44:13 -05:00
SplinterGP
d014595b73
Merge remote-tracking branch 'Yawn-wider/master' into holdelta
2020-04-30 21:49:16 -03:00
SplinterGP
a100713305
Puts some extra on name so sec officers can know it is job-related
2020-04-30 21:27:16 -03:00
serenekerosene
b693f8e06c
Scylla Fluff Item
...
I hope I did this right!!!!!!!! TY to Amaya for the guide
Fluff application was approved here: https://forum.vore-station.net/viewtopic.php?f=26&t=1744
2020-04-30 20:24:25 -04:00
SplinterGP
0b5c897eb8
adds YW edit
2020-04-30 20:24:42 -03:00
Novacat and GitHub
81900f5080
Merge pull request #7505 from AmayaWah/pleasestop
...
Adds Damon's bomber security jacket.
2020-04-29 18:45:51 -04:00
TheFurryFeline and GitHub
3afe4adaed
Remove Duplicate Code
...
Title, response to mirror.
2020-04-29 15:17:05 -04:00
Greenjoe12345 and VirgoBot
ff628daae1
Adds heterochromia for humanoid species and Teshari ( #7016 )
...
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
2020-04-29 15:11:41 -04:00
Amaya
c04d919051
*scream
2020-04-29 17:02:12 +02:00
Killian
c0a8fc67db
small loadout tweaks
2020-04-28 07:00:31 +01:00
Aronai Sieyes and GitHub
f2e6280161
Merge pull request #7479 from VOREStation/SERDYKOVKITFIX
...
Allows Serdy's modkit to be selected.
2020-04-27 10:57:33 -04:00
Aronai Sieyes and GitHub
45b67c5948
Merge pull request #7321 from KillianKirilenko/kk-collar
...
Colorable Collar/Choker Accessory
2020-04-27 10:56:08 -04:00
Cameron653
9eaea818b7
Allows Serdy's modkit to be selected.
2020-04-27 10:43:38 -04:00
Cameron653
1e29d2a734
Fixes & Changes Silencedmp5a5's fluff items.
2020-04-26 13:59:58 -04:00
Atermonera and VirgoBot
885c404bff
Merge pull request #7014 from KasparoVy/clothe_the_teshari
...
Adds Colorable Apron & Tesh Labcoat
2020-04-25 15:39:54 -04:00
Aronai Sieyes
0b79828ec9
Forbid and sanitize out hyphen as language prefix
2020-04-25 13:03:47 -04:00
Atermonera and VirgoBot
0d80f24a5f
Replaces toy waterflower with spraybottle waterflower ( #6997 )
2020-04-20 03:25:38 -04:00
Novacat and GitHub
119d7736d4
Merge pull request #7314 from VOREStation/aro-whisubtle
...
Adjust ghosts hearing whispers/subtles
2020-04-19 23:44:19 -04:00
Aronai Sieyes
209eb0e017
Port some random clothes
2020-04-18 19:41:54 -04:00
Killian
d5e344f178
colorable collar accessory
2020-04-18 18:18:37 +01:00
Aronai Sieyes
f7609c6aff
Makes it a preference
2020-04-17 17:44:05 -04:00
Killian and GitHub
35dedb85e8
Merge branch 'master' into kk-miscstuff
2020-04-17 19:56:51 +01:00
Repede
e44e346352
Release Update
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
2020-04-16 21:07:33 -04:00
Novacat and GitHub
13353294f2
Merge pull request #7239 from Heroman3003/headband-maid
...
Adds maid headband to loadout
2020-04-13 18:04:29 -04:00
Heroman
fa5422cc63
Adds a comment for future
2020-04-14 07:27:44 +10:00
Heroman
87a65a09c6
Fixes Azura's collar
2020-04-14 07:16:31 +10:00
Heroman
2073af57f1
Adds maid headband to loadout
2020-04-14 06:48:18 +10:00
Aronai Sieyes
9368dd2736
Talon job pref saving
2020-04-13 11:05:27 -04:00
MrSign
0da3c94d09
Update loadout_fluffitems_vr.dm
2020-04-13 13:14:19 +10:00
Atermonera and VirgoBot
83c1a512e2
Adds pref to toggle vchat without 60s wait for linux users ( #6980 )
2020-04-12 00:51:57 -04:00
CRTXBacon and GitHub
c78ffd954e
Add files via upload
2020-04-12 02:04:18 +01:00
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
