Skip to content

Commit

Permalink
Merge pull request #7588 from SamHPurp/loadout-names
Browse files Browse the repository at this point in the history
Makes a loadout message public-friendly
  • Loading branch information
Fox-McCloud committed Jun 21, 2017
2 parents c038f06 + 7e1933b commit 94ad151
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/game/jobs/job/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,15 @@
var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.gear[G.display_name]))
if(istype(placed_in))
if(isturf(placed_in))
to_chat(H, "<span class='notice'>Placing \the [G] on [placed_in]!</span>")
to_chat(H, "<span class='notice'>Placing [G.display_name] on [placed_in]!</span>")
else
to_chat(H, "<span class='noticed'>Placing \the [G] in [placed_in.name]")
to_chat(H, "<span class='noticed'>Placing [G.display_name] in [placed_in.name]")
continue
if(H.equip_to_appropriate_slot(G))
to_chat(H, "<span class='notice'>Placing \the [G] in your inventory!</span>")
to_chat(H, "<span class='notice'>Placing [G.display_name] in your inventory!</span>")
continue
if(H.put_in_hands(G))
to_chat(H, "<span class='notice'>Placing \the [G] in your hands!</span>")
to_chat(H, "<span class='notice'>Placing [G.display_name] in your hands!</span>")
continue
to_chat(H, "<span class='danger'>Failed to locate a storage object on your mob, either you spawned with no hands free and no backpack or this is a bug.</span>")
qdel(G)
Expand Down

0 comments on commit 94ad151

Please sign in to comment.