mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-21 13:05:36 +01:00
Resolved Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user