cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm
This commit is contained in:
skull132
2017-09-09 21:38:02 +03:00
parent 0d8fe2e6a4 4199d3a2d8
commit 16d33365c2
79 changed files with 1476 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/intern/intern.dm
+1 -1
View File
@@ -24,7 +24,7 @@
return 1
/datum/job/intern_med
title = "Nursing Intern"
title = "Medical Resident"
flag = INTERN_MED
department_flag = MEDSCI
faction = "Station"