cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source
This commit is contained in:
Spamcat
2013-03-31 21:03:43 +04:00
parent 3270b9cadf 3d61ae438b
commit 866a1c5feb
17 changed files with 1624 additions and 1469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -239,7 +239,7 @@
src.updatehealth()
// damage MANY external organs, in random order
/mob/living/proc/take_overall_damage(var/brute, var/burn)
/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -302,7 +302,7 @@ datum/preferences
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(LAWYER)
clothes_s = new /icon('icons/mob/uniform.dmi', "lawyer_blue_s")
clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)