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
|
b6b6b58a81
|
Adds Tyger tac to Clown whitelist
|
2020-03-08 08:30:47 +10:00 |
|
Mewchild
|
a6992a7475
|
Adds SgtRyder to mime whitelist
|
2019-08-19 23:37:39 -05:00 |
|
H0lySquirr3l
|
d9f42d0283
|
Update jobwhitelist.txt
|
2018-07-13 20:24:07 -05:00 |
|
Verkister
|
078a5d715f
|
Unleashes the clown drone
Oh the horror.
https://forum.vore-station.net/viewtopic.php?f=46&t=1354
|
2018-06-10 20:52:44 +03:00 |
|
Chargae
|
bf3ce8dc7b
|
Add Chargae to mime whitelist
|
2018-03-08 14:59:23 +11:00 |
|
KonBear
|
8922a6760e
|
Update jobwhitelist.txt
|
2018-01-02 19:10:46 -08:00 |
|
Cameron653
|
258a2f4ba6
|
Update jobwhitelist.txt
|
2017-09-30 14:53:07 -04:00 |
|
SuicidalPickles
|
cf00772705
|
Added name to whitelist.
Had been approved recently here:
https://forum.vore-station.net/viewtopic.php?f=46&t=1074
|
2017-09-02 14:15:06 -07:00 |
|
Yoshax
|
af9b809264
|
Resolves some whitelist issues
|
2017-06-11 22:36:28 +01:00 |
|
Arokha Sieyes
|
da15f24461
|
Seiga mime whitelist
In the title.
|
2017-03-24 21:43:11 -04:00 |
|
Kelshark
|
8cd45a3feb
|
Dogborgs get dank, removed fgts from whitelist, some little map additions
|
2017-01-10 20:57:38 -05:00 |
|
Kelshark
|
665d4be48a
|
Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
# maps/virgo-1.dmm
|
2016-12-28 17:31:26 -05:00 |
|
Kelshark
|
536e40ffde
|
Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# config/custom_items.txt
|
2016-12-07 12:22:48 -05:00 |
|
Kelshark
|
e366747a6e
|
Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
# icons/mob/human_races/r_def_xenochimera.dmi
# icons/mob/human_races/r_xenochimera.dmi
# maps/RandomZLevels/blackmarketpackers.dmm
# vorestation.dme
|
2016-11-02 14:07:59 -04:00 |
|
Arokha Sieyes
|
267f06f62a
|
Here
|
2016-10-21 11:28:48 -04:00 |
|