cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate

Browse Source 
# Conflicts:
#	icons/mob/hud.dmi
This commit is contained in:
Repede
2020-03-04 08:17:38 -05:00
parent 03af76bd29 8ec905066a
commit 6e293183ad
26 changed files with 765 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -204,7 +204,7 @@
/datum/gear/uniform/dept/undercoat/mining
display_name = "mining undercoat (Teshari)"
path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
path = /obj/item/clothing/under/seromi/undercoat/jobs/mining
allowed_roles = list("Quartermaster","Shaft Miner")
/datum/gear/uniform/dept/undercoat/security