CHOMPStation2

mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00

Files

Kelshark 9e4136784d Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi

2017-10-03 19:04:51 -04:00

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

2016-06-29 11:25:52 -04:00

general

Don't sanitize out Custom Species unless they are changing species

2017-05-29 17:19:03 -04:00

global

Convert to using Mediamanager lobby music

2017-05-08 02:33:46 -04:00

loadout

Merge branch 'master' of https://github.com/Repede/YawnWiderStation