diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 1a12ef12b2a..f880ad66d81 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -126,11 +126,6 @@ datum/controller/game_controller/proc/process() if(!air_processing_killed) timer = world.timeofday last_thing_processed = air_master.type - air_master.tick() - air_cost = (world.timeofday - timer) / 10 // this might make atmos slower - // 1. atmos won't process if the game is generally lagged out(no deadlocks) - // 2. if the server frequently crashes during atmos processing we will knowif(!kill_air) - //src.set_debug_state("Air Master") air_master.current_cycle++ if(!air_master.tick()) //Runtimed. diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 63a7121960b..a1247457934 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -28,9 +28,9 @@ color = "skrell_helmet_white" /obj/item/clothing/head/helmet/space/skrell/black - icon_state = "skrell_suit_black" - item_state = "skrell_suit_black" - color = "skrell_suit_black" + icon_state = "skrell_helmet_black" + item_state = "skrell_helmet_black" + color = "skrell_helmet_black" /obj/item/clothing/suit/space/skrell name = "Skrellian hardsuit" diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index dc291d06461..ea82e57925b 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -96,4 +96,14 @@ //TBD /mob/verb/check_languages() + set name = "Check Known Languages" + set category = "IC" + set src = usr + + var/dat = "Known Languages

" + + for(var/datum/language/L in languages) + dat += "[L.name] (:[L.key])
[L.desc]

" + + src << browse(dat, "window=checklanguage") return \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 510fd52709a..76cfbe77bd6 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -165,10 +165,8 @@ var/list/department_radio_keys = list( if(lowertext(channel_prefix) == ":[L.key]") speaking = L break - message_mode = department_radio_keys[channel_prefix] - - if (message_mode || speaking) + if (message_mode || speaking || copytext(message,1,2) == ":") message = trim(copytext(message, 3)) if (!(istype(src,/mob/living/carbon/human) || istype(src,/mob/living/carbon/monkey) || istype(src, /mob/living/simple_animal/parrot) || isrobot(src) && (message_mode=="department" || (message_mode in radiochannels)))) message_mode = null //only humans can use headsets diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5970422545d..c7125a26770 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ad74f1a8efa..fff04014c4f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 8dc24387287..fdcee551930 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 27880195516..cb68bd46f3f 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ