diff --git a/code/defines/client.dm b/code/defines/client.dm index a594e2a805a..88352bad4b9 100644 --- a/code/defines/client.dm +++ b/code/defines/client.dm @@ -24,6 +24,8 @@ var/warned = 0 var/karma = 0 var/karma_spent = 0 + var/ooccolor = "#b82e00" //only used for admins of host level, default is equal to admin default + var/midis = 1 //Check if midis should be played for someone -- Urist authenticate = 0 // comment out the line below when debugging locally to enable the options & messages menu diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index 2fb30da9abf..51b09f7f776 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -39,7 +39,6 @@ var/poll_answer = 0.0 var/sdisabilities = 0 var/disabilities = 0 - var/midis = 1 //Check if midis should be played for someone -- Urist var/atom/movable/pulling = null var/stat = 0.0 var/next_move = null diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 4288bb48dda..05987df680e 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -29,7 +29,7 @@ return 1 else if (istype(user, /mob/living/carbon)) - if (user:mutations & 1) + if (user:mutations & 1 && get_dist(source, user) <= 7) var/X = source:x var/Y = source:y var/Z = source:z diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index d66acbe0cce..51b170ca865 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -76,7 +76,7 @@ else explanation = "Free objective." if("eldergod") - explanation = "Summon Nar-Sie via the use of an appropriate rune. It will only work if nine cultists stand on and around it." + explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." cult_mind.current << "Objective #[obj_count]: [explanation]" cult_mind.memory += "Objective #[obj_count]: [explanation]
" cult_mind.current << "The convert rune is join blood self" @@ -173,7 +173,7 @@ else explanation = "Free objective." if("eldergod") - explanation = "Summon Nar-Sie via the use of an appropriate rune. It will only work if nine cultists stand on and around it." + explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." cult_mind.current << "Objective #[obj_count]: [explanation]" cult_mind.memory += "Objective #[obj_count]: [explanation]
" diff --git a/code/game/magic/cultist/rune4.dm b/code/game/magic/cultist/rune4.dm index 4ca8ef8fd9b..0a5d90bd263 100644 --- a/code/game/magic/cultist/rune4.dm +++ b/code/game/magic/cultist/rune4.dm @@ -1,6 +1,6 @@ /obj/rune/proc/tearreality() var/cultist_count = 0 - for(var/mob/M in orange(1,src)) + for(var/mob/M in range(1,src)) if(cultists.Find(M)) M.say("Tok-lyr rqa'nap g'lt-ulotf!") cultist_count += 1 diff --git a/code/game/objects/items/robot_parts.dm b/code/game/objects/items/robot_parts.dm index 8fe9d88f450..a1aa8181de3 100644 --- a/code/game/objects/items/robot_parts.dm +++ b/code/game/objects/items/robot_parts.dm @@ -128,7 +128,6 @@ var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(src.loc)) if (src.brain.owner) O.gender = src.brain.owner.gender - O.midis = src.brain.owner.midis //O.start = 1 O.invisibility = 0 O.name = "Cyborg" diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 11548483a19..ba6e169590f 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -38,6 +38,8 @@ // C << "OOC: [src.key]: [msg]" if (src.client.holder.rank == "Filthy Xeno") C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" + else if (src.client.holder.rank == "Host") + C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" else C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" diff --git a/code/game/verbs/sound.dm b/code/game/verbs/sound.dm index 4d7d82e10bd..fb593ad0476 100644 --- a/code/game/verbs/sound.dm +++ b/code/game/verbs/sound.dm @@ -2,10 +2,10 @@ set category = "Special Verbs" set name = "Toggle Midis" - if(usr.midis) - usr.midis=0 + if(usr.client.midis) + usr.client.midis=0 usr << "You will now stop receiving any sounds uploaded by admins." else - usr.midis=1 + usr.client.midis=1 usr << "You will now start receiving any sounds uploaded by admins." return \ No newline at end of file diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f7be096c84e..f51f58248e1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -39,6 +39,7 @@ src.verbs += /client/proc/cmd_admin_abominize // -- TLE src.verbs += /client/proc/make_cultist // -- TLE src.verbs += /client/proc/check_words // -- Urist + src.verbs += /client/proc/colorooc // -- Urist src.verbs += /client/proc/cmd_admin_monkeyize src.verbs += /client/proc/cmd_admin_robotize src.verbs += /client/proc/cmd_admin_add_freeform_ai_law @@ -705,6 +706,12 @@ log_admin("[key_name(usr)] has used boom boom boom shake the room") message_admins("[key_name_admin(usr)] has used boom boom boom shake the room", 1) +/client/proc/colorooc() + set category = "Fun" + set name = "OOC Text Color" + src.ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color + return + /client/proc/stealth() set category = "Admin" set name = "Stealth Mode" diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 3477e1a81b4..7c481499d2c 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -15,7 +15,7 @@ log_admin("[key_name(src)] played sound [S]") message_admins("[key_name_admin(src)] played sound [S]", 1) for(var/mob/M in world) - if(M.midis) + if(M.client.midis) M << uploaded_sound else if(usr.client.canplaysound) @@ -23,7 +23,7 @@ log_admin("[key_name(src)] played sound [S]") message_admins("[key_name_admin(src)] played sound [S]", 1) for(var/mob/M in world) - if(M.midis) + if(M.client.midis) M << uploaded_sound else usr << "You already used up your jukebox monies this round!" @@ -43,7 +43,7 @@ message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1) for(var/mob/M in world) - if(M.midis) + if(M.client.midis) M << 'cubanpetetime.ogg' for(var/mob/living/carbon/human/CP in world) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index b641c36c907..cf106d33380 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -10,7 +10,6 @@ src.loc = get_turf(corpse.loc) src.real_name = corpse.real_name src.name = corpse.real_name - src.midis = corpse.midis src.verbs += /mob/dead/observer/proc/reenter_corpse /mob/proc/ghostize() diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index cb3411c7171..51426311495 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -6,6 +6,7 @@ datum/preferences var/be_syndicate var/midis = 1 + var/ooccolor = "#b82e00" var/be_random_name = 0 var/underwear = 1 @@ -156,6 +157,9 @@ datum/preferences dat += "
" dat += "UI Style: [src.UI == 'screen1.dmi' ? "New" : "Old"]
" dat += "Play admin midis: [src.midis == 1 ? "Yes" : "No"]
" + if(user.client.holder.rank == "Host") + dat += "
OOC
" + dat += "Change colour
IM
" dat += "
Occupation Choices
" if (destructive.Find(src.occupation1)) @@ -482,6 +486,12 @@ datum/preferences if (new_style) src.h_style = new_style + if (link_tags["ooccolor"]) + var/ooccolor = input(user, "Please select OOC colour.", "OOC colour") as color + + if(ooccolor) + src.ooccolor = ooccolor + if (link_tags["f_style"]) var/new_style = input(user, "Please select facial style", "Character Generation") as null|anything in list("Watson", "Chaplin", "Selleck", "Full Beard", "Long Beard", "Neckbeard", "Van Dyke", "Elvis", "Abe", "Chinstrap", "Hipster", "Goatee", "Hogan", "Shaved") @@ -585,7 +595,6 @@ datum/preferences character.f_style = f_style character.UI = UI - character.midis = midis switch(h_style) if("Short Hair") @@ -645,6 +654,10 @@ datum/preferences character.update_face() character.update_body() + spawn(10) + character.client.midis = midis + character.client.ooccolor = ooccolor + /* if (!M.real_name || M.be_random_name)