diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 7cffcb3bc7..8ec2d00afe 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -59,6 +59,17 @@ var/datum/subsystem/events/SSevent /datum/subsystem/events/proc/reschedule() scheduled = world.time + rand(frequency_lower, max(frequency_lower,frequency_upper)) + if(world.time > 108000) //2:45 + frequency_lower=1000 + frequency_upper=1500 + //if ((!( ticker ) || emergency_shuttle.location)) + //if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_CALL) + // return + if(SSshuttle.emergency.mode < SHUTTLE_CALL) + SSshuttle.emergency.request(null, 1.5) + log_game("Round time limit reached. Shuttle has been auto-called.") + message_admins("Round time limit reached. Shuttle called.") + //selects a random event based on whether it can occur and it's 'weight'(probability) /datum/subsystem/events/proc/spawnEvent() if(!config.allow_random_events) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3a9a8cf776..886c55fe09 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -273,6 +273,13 @@ level = 1 cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks +/obj/item/weapon/storage/backpack/satchel/duty + name = "duty satchel" + desc = "An extra trendy looking satchel." + icon_state = "satchel-duty" + + + /obj/item/weapon/storage/backpack/satchel/flat/hide(var/intact) if(intact) invisibility = INVISIBILITY_MAXIMUM diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 29d531f926..bd41175673 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -37,14 +37,29 @@ datum/species/canid /datum/species/ailurus name = "Ailurus" id = "ailurus" - default_color = "BCAC9B" + default_color = "4B4B4B" species_traits = list(EYECOLOR,LIPS,HAIR) mutant_bodyparts = list("mam_tail") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "ailurus") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' - roundstart = 1 //no sprites yet + roundstart = 1 + +/datum/species/capra + name = "Capra" + id = "capra" + default_color = "4B4B4B" + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR) + mutant_bodyparts = list("mam_tail") + default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "capra") + attack_verb = "claw" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + roundstart = 1 + + + //AVIAN// /datum/species/avian @@ -60,6 +75,18 @@ datum/species/canid roundstart = 0 //no sprites yet blacklisted = 1 +/datum/species/avian + name = "Hawk" + id = "hawk" + default_color = "BCAC9B" + species_traits = list(EYECOLOR,LIPS,HAIR) + mutant_bodyparts = list("mam_tail") + default_features = list("wings" = "hawk") + attack_verb = "peck" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + roundstart = 1 + //AQUATIC// /datum/species/shark name = "Shark" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 45dbdc9f69..8b73f2be27 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1381,3 +1381,414 @@ /datum/sprite_accessory/legs/digitigrade_lizard name = "Digitigrade Legs" + +/* tbi eventually idk +/datum/sprite_accessory/legs/digitigrade_mam + name = "Anthro Digitigrade Legs" + icon = 'icons/mob/mam_bodyparts.dmi' +*/ +//Human Ears/Tails + +/datum/sprite_accessory/ears/fox + name = "Fox" + icon_state = "fox" + hasinner = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/ears/wolf + name = "Wolf" + icon_state = "wolf" + hasinner = 1 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/fox + name = "Fox" + icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/tails_animated/human/fox + name = "Fox" + icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/tails/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/catbig + name = "Cat, Big" + icon_state = "catbig" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated/human/catbig + name = "Cat, Big" + icon_state = "catbig" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/ears/fennec + name = "Fennec" + icon_state = "fennec" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/fennec + name = "Fennec" + icon_state = "fennec" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated/human/fennec + name = "Fennec" + icon_state = "fennec" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/ears/lab + name = "Dog, Floppy" + icon_state = "lab" + hasinner = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/husky + name = "Husky" + icon_state = "husky" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/tails_animated/human/husky + name = "Husky" + icon_state = "husky" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/ears/murid + name = "Murid" + icon_state = "murid" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/murid + name = "Murid" + icon_state = "murid" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + + +/datum/sprite_accessory/tails_animated/human/murid + name = "Murid" + icon_state = "murid" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/shark + name = "Shark" + icon_state = "shark" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/shark/datashark + name = "datashark" + icon_state = "datashark" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/ailurus + name = "ailurus" + icon_state = "ailurus" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/ears/squirrel + name = "Squirrel" + icon_state = "squirrel" + hasinner= 1 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails/human/squirrel + name = "Squirrel" + icon_state = "squirrel" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tails_animated/human/squirrel + name = "Squirrel" + icon_state = "squirrel" + icon = 'icons/mob/mam_bodyparts.dmi' + +//Mammal Bodyparts +/datum/sprite_accessory/mam_ears + icon = 'icons/mob/mam_bodyparts.dmi' +/datum/sprite_accessory/mam_ears/none + name = "None" + +/datum/sprite_accessory/mam_tails + icon = 'icons/mob/mam_bodyparts.dmi' +/datum/sprite_accessory/mam_tails/none + name = "None" + +/datum/sprite_accessory/mam_tails_animated + icon = 'icons/mob/mam_bodyparts.dmi' +/datum/sprite_accessory/mam_tails_animated/none + name = "None" + +//Snouts +/datum/sprite_accessory/snouts/lcanid + name = "Fox, Long" + icon_state = "lcanid" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/snouts/scanid + name = "Fox, Short" + icon_state = "scanid" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/snouts/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/snouts/husky + name = "Husky" + icon_state = "husky" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +//Cat, Big +/datum/sprite_accessory/mam_ears/catbig + name = "Cat, Big" + icon_state = "cat" + hasinner = 1 + icon = 'icons/mob/mutant_bodyparts.dmi' + +/datum/sprite_accessory/mam_tails/catbig + name = "Cat, Big" + icon_state = "catbig" + +/datum/sprite_accessory/mam_tails_animated/catbig + name = "Cat, Big" + icon_state = "catbig" + +//Wolf +/datum/sprite_accessory/mam_ears/wolf + name = "Wolf" + icon_state = "wolf" + hasinner = 1 + +/datum/sprite_accessory/mam_tails/wolf + name = "Wolf" + icon_state = "wolf" + +/datum/sprite_accessory/mam_tails_animated/wolf + name = "Wolf" + icon_state = "wolf" + +//Fox +/datum/sprite_accessory/mam_ears/fox + name = "Fox" + icon_state = "fox" + hasinner = 0 + +/datum/sprite_accessory/mam_tails/fox + name = "Fox" + icon_state = "fox" + extra = 1 + extra_color_src = MUTCOLORS2 + +/datum/sprite_accessory/mam_tails_animated/fox + name = "Fox" + icon_state = "fox" + extra = 1 + extra_color_src = MUTCOLORS2 + +//Fennec +/datum/sprite_accessory/mam_ears/fennec + name = "Fennec" + icon_state = "fennec" + hasinner = 1 + +/datum/sprite_accessory/mam_tails/fennec + name = "Fennec" + icon_state = "fennec" + +/datum/sprite_accessory/mam_tails_animated/fennec + name = "Fennec" + icon_state = "fennec" + +//Lab +/datum/sprite_accessory/mam_ears/lab + name = "Dog, Long" + icon_state = "lab" + +/datum/sprite_accessory/mam_tails/lab + name = "Lab" + icon_state = "lab" + +/datum/sprite_accessory/mam_tails_animated/lab + name = "Lab" + icon_state = "lab" + +//Husky +/datum/sprite_accessory/mam_ears/husky + name = "Husky" + icon_state = "wolf" + hasinner = 1 + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/mam_tails/husky + name = "Husky" + icon_state = "husky" + extra = 1 + +/datum/sprite_accessory/mam_tails_animated/husky + name = "Husky" + icon_state = "husky" + extra = 1 + +//Murid +/datum/sprite_accessory/mam_ears/murid + name = "Murid" + icon_state = "murid" + +/datum/sprite_accessory/mam_tails/murid + name = "Murid" + icon_state = "murid" + color_src = 0 + +/datum/sprite_accessory/mam_tails_animated/murid + name = "Murid" + icon_state = "murid" + color_src = 0 + +//Shark +/datum/sprite_accessory/mam_tails/shark + name = "Shark" + icon_state = "shark" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + + +/datum/sprite_accessory/mam_tails/shark/datashark + name = "DataShark" + icon_state = "datashark" + color_src = 0 + icon = 'icons/mob/mam_bodyparts.dmi' + + +//Squirrel +/datum/sprite_accessory/mam_ears/squirrel + name = "Squirrel" + icon_state = "squirrel" + hasinner= 1 + +/datum/sprite_accessory/mam_tails/squirrel + name = "Squirrel" + icon_state = "squirrel" + +/datum/sprite_accessory/mam_tails_animated/squirrel + name = "Squirrel" + icon_state = "squirrel" + +/datum/sprite_accessory/mam_tails/ailurus + name = "Ailurus" + icon_state = "ailurus" + +//Capra +/datum/sprite_accessory/mam_tails/capra + name = "Capra" + icon_state = "capra" + +//Hawk +/datum/sprite_accessory/mam_tails/hawk + name = "Hawk" + icon_state = "hawk" + + +//Mammal Specific Body Markings +/datum/sprite_accessory/mam_body_markings + color_src = MUTCOLORS2 + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/mam_body_markings/none + name = "None" + icon_state = "none" + +/datum/sprite_accessory/mam_body_markings/belly + name = "Belly" + icon_state = "belly" + gender_specific = 1 +/* +/datum/sprite_accessory/mam_body_markings/bellyhandsfeet + name = "Belly, Hands, & Feet" + icon_state = "bellyhandsfeet" + gender_specific = 1 + extra = 1 + extra_color_src = MUTCOLORS3 +*/ + +//Xeno Dorsal Tubes +/datum/sprite_accessory/xeno_dorsal + icon = 'icons/mob/exotic_bodyparts.dmi' + color_src = 0 + +/datum/sprite_accessory/xeno_dorsal/none + name = "None" + +/datum/sprite_accessory/xeno_dorsal/normal + name = "Dorsal Tubes" + icon_state = "dortubes" + +//Xeno Tail +/datum/sprite_accessory/xeno_tail + icon = 'icons/mob/exotic_bodyparts.dmi' + color_src = 0 + +/datum/sprite_accessory/xeno_tail/none + name = "None" + +/datum/sprite_accessory/xeno_tail/normal + name = "Xenomorph Tail" + icon_state = "xeno" + +//Xeno Caste Heads +//unused as of October 3, 2016 +/datum/sprite_accessory/xeno_head + icon = 'icons/mob/exotic_bodyparts.dmi' + color_src = 0 + +/datum/sprite_accessory/xeno_head/none + name = "None" + + +/datum/sprite_accessory/xeno_head/hunter + name = "Hunter" + icon_state = "hunter" + +/datum/sprite_accessory/xeno_head/drone + name = "Drone" + icon_state = "drone" + +/datum/sprite_accessory/xeno_head/sentinel + name = "Sentinel" + icon_state = "sentinel" +/* +//Slimecoon Parts +/datum/sprite_accessory/slimecoon_ears + icon = 'icons/mob/exotic_bodyparts.dmi' + name = "Slimecoon Ears" + icon_state = "slimecoon" +/datum/sprite_accessory/slimecoon_tail + icon = 'icons/mob/exotic_bodyparts.dmi' + name = "Slimecoon Tail" + icon_state = "slimecoon" +/datum/sprite_accessory/slimecoon_snout + icon = 'icons/mob/exotic_bodyparts.dmi' + name = "Hunter" + icon_state = "slimecoon" */ + diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index 7c58156298..8ebc050f6c 100644 Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 5fd9515786..f0352cbcac 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 1bb5de0267..dac5dfd819 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 65ab25858a..352adcab43 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index 8140b72a17..874d4aacb0 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index d4f27ed2b8..9d2e8af027 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ