Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
2018-04-06 15:33:00 -04:00
59 changed files with 593 additions and 420 deletions

View File

@@ -111,6 +111,7 @@
user.visible_message("<span class='notice'>\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>", \
"<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
W.bandage()
W.disinfect()
used++
affecting.update_damages()
if(used == amount)