Merge pull request #29940

This commit is contained in:
Jordan Brown
2017-08-17 10:13:00 -04:00
369 changed files with 1028 additions and 1058 deletions
+1 -1
View File
@@ -410,7 +410,7 @@
H.equip_to_slot_or_del(I, slot_w_uniform)
qdel(olduniform)
if(droptype == "Yes")
I.flags |= NODROP
I.flags_1 |= NODROP_1
else
to_chat(H, "You're not kawaii enough for this.")
+1 -1
View File
@@ -59,7 +59,7 @@ GLOBAL_VAR_INIT(highlander, FALSE)
W.access += get_all_centcom_access()
W.assignment = "Highlander"
W.registered_name = real_name
W.flags |= NODROP
W.flags_1 |= NODROP_1
W.update_label(real_name)
equip_to_slot_or_del(W, slot_wear_id)