Resolved Conflicts:

_maps/map_files/tgstation.2.1.3.dmm
This commit is contained in:
ikarrus
2014-08-21 19:47:30 -06:00
902 changed files with 17637 additions and 17138 deletions
+3 -2
View File
@@ -663,7 +663,8 @@ var/global/list/g_fancy_list_of_safe_types = null
if ("as job...")
if(jobdatum)
dresscode = "[jobdatum.title]"
dresscode = jobdatum.title
M.job = jobdatum.title
jobdatum.equip(M)
if ("standard space gear")
@@ -1136,4 +1137,4 @@ var/global/list/g_fancy_list_of_safe_types = null
W.assignment = "Death Commando"
W.registered_name = M.real_name
W.update_label(M.real_name)
M.equip_to_slot_or_del(W, slot_wear_id)
M.equip_to_slot_or_del(W, slot_wear_id)