diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index e2ee0dc56b3..300aee55f56 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -85,5 +85,10 @@ client/verb/showrevinfo() set name = "Show Server Revision" var/output = "Sorry, the revision info is unavailable." output = file2text("/home/bay12/live/data/gitcommit") + output += "Current Infomational Settings:
" + output += "Tensioner Status: [config.Tensioner_Active]
" + //output += "Current Tension: [tension_master.score]
" + //output += "Tensioner Debug Data: R1:[tension_master.round1] R2:[tension_master.round2] R3:[tension_master.round3] R4:[tension_master.round4] ES: [tension_master.eversupressed] CD: [tension_master.cooldown]
" + output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]
" usr << browse(output,"window=revdata"); return diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index a0c5ec98152..b22fcc461e1 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -58,6 +58,14 @@ name = "Longest Hair" icon_state = "hair_vlong" + longalt + name = "Long Hair Alt" + icon_state = "hair_longfringe" + + longestalt + name = "Longest Hair Alt" + icon_state = "hair_vlongfringe" + halfbang name = "Half-banged Hair" icon_state = "hair_halfbang" @@ -89,6 +97,7 @@ mohawk name = "Mohawk" icon_state = "hair_d" + choose_female = 0 // gross balding name = "Balding Hair" @@ -118,6 +127,7 @@ dreadlocks name = "Dreadlocks" icon_state = "hair_dreads" + choose_female = 0 // okay.jpg jensen name = "Adam Jensen Hair" @@ -132,14 +142,6 @@ icon_state = "bald" choose_female = 0 - longalt - name = "Long Hair Alt" - icon_state = "hair_longfringe" - - longestalt - name = "Longest Hair Alt" - icon_state = "hair_vlongfringe" - himecut name = "Hime Cut" icon_state = "hair_himecut" @@ -148,6 +150,9 @@ name = "Curls" icon_state = "hair_curls" + spikey + name = "Spikey" + icon_state = "hair_spikey" /* /////////////////////////////////// diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 10ab3bea56e..77f41fd2bf9 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ