diff --git a/code/defines/mob/simple_animal/life.dm b/code/defines/mob/simple_animal/life.dm index 6657314d2f4..11a8db6b1ef 100644 --- a/code/defines/mob/simple_animal/life.dm +++ b/code/defines/mob/simple_animal/life.dm @@ -39,6 +39,35 @@ var/min_n2 = 0 var/max_n2 = 0 var/unsuitable_atoms_damage = 2 //This damage is taken when atmos doesn't fit all the requirements above. +//Cat + +/mob/living/simple_animal/cat + name = "Cat" + desc = "Kitty!!" + icon = 'mob.dmi' + icon_state = "tempcat" + icon_living = "tempcat" + icon_dead = "gibbed-h" + speak = list("Meow!","Esp!","Purr!","HSSSSS") + speak_emote = list("meows", "purrs:") + emote_hear = list("meows","mews") + emote_see = list("shakes it's head", "shivers") + speak_chance = 1 + turns_per_move = 5 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi + meat_amount = 3 + response_help = "pets the" + response_disarm = "gently pushes aside the" + response_harm = "kicks the" + +/mob/living/simple_animal/cat/Runtime + name = "Runtime" + desc = "It's Runtime, what else do you need to know?" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" + var/turns_since_scan = 0 + var/obj/movement_target //Corgi /mob/living/simple_animal/corgi diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm index 2f96caef684..86341743c93 100644 --- a/code/defines/obj/radio.dm +++ b/code/defines/obj/radio.dm @@ -74,112 +74,112 @@ /obj/item/device/radio/headset/headset_sec // -- TLE name = "Security Radio Headset" - desc = "This is used by your elite security force." + desc = "This is used by your elite security force. To access the security channel, use :s." icon_state = "sec_headset" item_state = "headset" channels = list("Security" = 1) /obj/item/device/radio/headset/headset_eng // -- TLE name = "Engineering Radio Headset" - desc = "When the engineers wishes to chat like girls." + desc = "When the engineers wish to chat like girls. To access the engineering channel, use :e. " icon_state = "eng_headset" item_state = "headset" channels = list("Engineering" = 1) /obj/item/device/radio/headset/headset_rob // -- DH name = "Robotics Radio Headset" - desc = "Made specifically for the roboticists who cannot decide between departments." + desc = "Made specifically for the roboticists who cannot decide between departments. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_headset" item_state = "headset" channels = list("Engineering" = 1, "Science" = 1) /obj/item/device/radio/headset/headset_med // -- TLE name = "Medical Radio Headset" - desc = "A headset for the trained staff of the medbay." + desc = "A headset for the trained staff of the medbay. To access the medical channel, use :m." icon_state = "med_headset" item_state = "headset" channels = list("Medical" = 1) /obj/item/device/radio/headset/headset_sci // -- Bar name = "Science Radio Headset" - desc = "A sciency headset. Like usual." + desc = "A sciency headset. Like usual. To access the science channel, use :n." icon_state = "com_headset" item_state = "headset" channels = list("Science" = 1) /obj/item/device/radio/headset/headset_medsci // -- Micro name = "Medical Research Radio Headset" - desc = "A headset that is a result of the mating between medical and science." + desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n." icon_state = "med_headset" item_state = "headset" channels = list("Medical" = 1, "Science" = 1) /obj/item/device/radio/headset/headset_com // -- TLE name = "Command Radio Headset" - desc = "A headset with a commanding channel" + desc = "A headset with a commanding channel. To access the command channel, use :c." icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1) /obj/item/device/radio/headset/heads/captain // -- Bar name = "Captain's Headset" - desc = "The headset of the boss." + desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science." icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0) /obj/item/device/radio/headset/heads/rd // -- Bar name = "Research Director's Headset" - desc = "Headset of the researching God." + desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c." icon_state = "com_headset" item_state = "headset" channels = list("Science" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/hos // -- Bar name = "Head of Security's Headset" - desc = "The headset of the man who protects your worthless lifes." + desc = "The headset of the man who protects your worthless lifes. To access the security channel, use :s. For command, use :c." icon_state = "com_headset" item_state = "headset" channels = list("Security" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/ce // -- Bar name = "Chief Engineer's Headset" - desc = "The headset of the guy who is in charge of morons." + desc = "The headset of the guy who is in charge of morons. To access the engineering channel, use :e. For command, use :c." icon_state = "com_headset" item_state = "headset" channels = list("Engineering" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/cmo // -- Bar name = "Chief Medical Officer's Headset" - desc = "The headset of the highly trained medical chief." + desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c." icon_state = "com_headset" item_state = "headset" channels = list("Medical" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/hop // -- rastaf0 name = "Head of Personnel's Headset" - desc = "The headset of the guy who will one day be captain." + desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining." icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0) /obj/item/device/radio/headset/headset_mine // -- rastaf0 name = "Mining Radio Headset" - desc = "Headset used by miners. How useless." + desc = "Headset used by miners. How useless. To access the mining channel, use :d." icon_state = "mine_headset" item_state = "headset" channels = list("Mining" = 1) /obj/item/device/radio/headset/headset_cargo // -- rastaf0 name = "Cargo Radio Headset" - desc = "Headset used by the QM's slaves." + desc = "Headset used by the QM's slaves. To access the cargo channel, use :q." icon_state = "cargo_headset" item_state = "headset" channels = list("Cargo" = 1) /obj/item/device/radio/headset/heads/qm // -- rastaf0 name = "Quartermaster's Headset" - desc = "The headset of the man who control your toiletpaper supply." + desc = "The headset of the man who control your toiletpaper supply. To access the cargo channel, use :q. For mining, use :d." icon_state = "cargo_headset" item_state = "headset" channels = list("Cargo" = 1, "Mining" = 1) diff --git a/icons/changelog.html b/icons/changelog.html index 36478534345..71cdf8009c5 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -57,7 +57,20 @@ should be listed in the changelog upon commit tho. Thanks. --> 13 September 2011: -13 September 2011: -
    -
  • Errorage updated: -
      -
    • Healing, attacking or 'gently tapping' Ian will now properly display the name of the attacker to all people.
      • -
    -
    • -
11 September 2011:
    diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 964c3c62777..6e0e7b6a3fc 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/sound/ambience/ambimine.ogg b/sound/ambience/ambimine.ogg index 46b9eb33e42..6a7fbc391da 100644 Binary files a/sound/ambience/ambimine.ogg and b/sound/ambience/ambimine.ogg differ diff --git a/sound/voice/malf.ogg b/sound/voice/malf.ogg new file mode 100644 index 00000000000..86d6179e21e Binary files /dev/null and b/sound/voice/malf.ogg differ