"
- dat += "Flavor Text" + dat += "General Examine Text" dat += "Set Examine Text" if(length(features["flavor_text"]) <= 40) if(!length(features["flavor_text"])) @@ -391,6 +393,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["flavor_text"]]" else dat += "[TextPreview(features["flavor_text"])]... " + dat += " OOC Text" + dat += "Set OOC Text" + if(length(features["ooc_text"]) <= 40) + if(!length(features["ooc_text"])) + dat += "\[...\]" + else + dat += "[features["ooc_text"]]" + else + dat += "[TextPreview(features["ooc_text"])]... " + dat += " Body" dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]" dat += "Species:[pref_species.id] " @@ -1049,8 +1061,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(!gear_tab) gear_tab = GLOB.loadout_items[1] dat += "
General" if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. . += "...?" + output += " ...?" else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either. . += "...?" + output += " ...?" else . += "[print_flavor_text()]" + output += " [url_encode(flavor_text)]" + if(ooc_text) + output += " OOC" + output += " [url_encode(ooc_text)]" + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg) . += "*---------*" + //stat panel + if(ishuman(src)) + user.client << output(output, "statbrowser:update_examine") //open the examine window + user.client << output(null, "statbrowser:create_mobexamine") //open the examine window + /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects! var/list/dat = list() if(!pronoun_replacement) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 58264160..27e02a7f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -29,9 +29,6 @@ . = ..() - if(CONFIG_GET(flag/disable_stambuffer)) - togglesprint() - AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, /mob/living/carbon/human/clean_blood))) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 874ad974..fd9fdcb5 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -70,3 +70,4 @@ var/last_fire_update var/account_id can_be_held = "micro" + appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index ec58a3be..ab611301 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -10,6 +10,9 @@ mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat + liked_food = MEAT | RAW | DAIRY + disliked_food = FRIED | FRUIT + /datum/species/human/felinid/qualifies_for_rank(rank, list/features) return TRUE diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 79f32b4f..d9493d6f 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put /mob/living/carbon/handle_status_effects() ..() if(getStaminaLoss() && !combatmode)//CIT CHANGE - prevents stamina regen while combat mode is active - adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5)//CIT CHANGE - decreases adjuststaminaloss to stop stamina damage from being such a joke + adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5) if(!recoveringstam && incomingstammult != 1) incomingstammult = max(0.01, incomingstammult) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index bb513581..b2e1aaf4 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -85,7 +85,7 @@ ranged = 1 retreat_distance = 5 minimum_distance = 5 - move_to_delay = 4 + move_to_delay = 7 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 4, /obj/item/stack/sheet/animalhide/xeno = 1) projectiletype = /obj/item/projectile/neurotox @@ -133,7 +133,7 @@ icon_living = "alienq" icon_dead = "alienq_dead" bubble_icon = "alienroyal" - move_to_delay = 4 + move_to_delay = 7 maxHealth = 400 health = 400 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10, diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 524c220f..e744d669 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -30,7 +30,7 @@ health = 10 spacewalk = TRUE faction = list("hostile") - move_to_delay = 0 + move_to_delay = 1 obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE mouse_opacity = MOUSE_OPACITY_OPAQUE diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 1f9c0b93..cc45e8c0 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -87,7 +87,7 @@ melee_damage_lower += rand(4, 10) melee_damage_upper += rand(10,20) maxHealth += rand(40,60) - move_to_delay = rand(3,7) + move_to_delay = rand(5,8) /mob/living/simple_animal/hostile/carp/cayenne name = "Cayenne" diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 33e29689..fb61b593 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -40,7 +40,7 @@ faction = list("spiders") var/busy = SPIDER_IDLE pass_flags = PASSTABLE - move_to_delay = 6 + move_to_delay = 7 ventcrawler = VENTCRAWLER_ALWAYS attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' @@ -140,7 +140,7 @@ melee_damage_lower = 10 melee_damage_upper = 20 poison_per_bite = 5 - move_to_delay = 5 + move_to_delay = 7 //vipers are the rare variant of the hunter, no IMMEDIATE damage but so much poison medical care will be needed fast. /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper @@ -154,7 +154,7 @@ melee_damage_lower = 1 melee_damage_upper = 1 poison_per_bite = 12 - move_to_delay = 4 + move_to_delay = 5 poison_type = /datum/reagent/toxin/venom //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe? speed = 1 gold_core_spawnable = NO_SPAWN @@ -171,7 +171,7 @@ melee_damage_lower = 35 melee_damage_upper = 40 poison_per_bite = 0 - move_to_delay = 8 + move_to_delay = 10 speed = 7 status_flags = NONE mob_size = MOB_SIZE_LARGE diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index f6b62e8d..276d5989 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -17,7 +17,7 @@ var/projectiletype //set ONLY it and NULLIFY casingtype var, if we have ONLY projectile var/projectilesound var/casingtype //set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING - var/move_to_delay = 3 //delay for the automated movement. + var/move_to_delay = 5 //delay for the automated movement. var/list/friends = list() var/list/emote_taunt = list() var/taunt_chance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index af6405ad..dca96574 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -33,7 +33,7 @@ Difficulty: Medium movement_type = GROUND speak_emote = list("roars") speed = 1 - move_to_delay = 2 + move_to_delay = 4 projectiletype = /obj/item/projectile/kinetic/miner projectilesound = 'sound/weapons/kenetic_accel.ogg' ranged = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 83abde2f..74aa59f9 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -40,7 +40,7 @@ Difficulty: Hard melee_damage_lower = 40 melee_damage_upper = 40 speed = 1 - move_to_delay = 10 + move_to_delay = 15 ranged_cooldown_time = 10 ranged = 1 pixel_x = -32 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 573a9ef8..37d5b027 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -38,7 +38,7 @@ Difficulty: Very Hard melee_damage_lower = 40 melee_damage_upper = 40 speed = 1 - move_to_delay = 10 + move_to_delay = 14 ranged = 1 pixel_x = -32 del_on_death = 1 @@ -64,7 +64,7 @@ Difficulty: Very Hard ranged_cooldown = world.time + 30 telegraph() dir_shots(GLOB.alldirs) - move_to_delay = 3 + move_to_delay = 5 return else move_to_delay = initial(move_to_delay) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 0e3cde56..1da1c832 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -48,7 +48,7 @@ Difficulty: Medium melee_damage_lower = 40 melee_damage_upper = 40 speed = 1 - move_to_delay = 5 + move_to_delay = 8 ranged = 1 pixel_x = -16 crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher) @@ -138,7 +138,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir) var/list/hit_things = list(src) var/turf/E = get_edge_target_turf(src, dir) - var/range = 10 + var/range = 8 var/turf/previousturf = get_turf(src) for(var/turf/J in getline(src,E)) if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J]))) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 397d4092..5ae29cb8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -52,7 +52,7 @@ Difficulty: Normal melee_damage_upper = 20 blood_volume = 0 speed = 1 - move_to_delay = 11 + move_to_delay = 15 ranged = 1 ranged_cooldown_time = 40 aggro_vision_range = 21 //so it can see to one side of the arena to the other @@ -66,9 +66,9 @@ Difficulty: Normal var/burst_range = 3 //range on burst aoe var/beam_range = 5 //range on cross blast beams - var/chaser_speed = 2 //how fast chasers are currently + var/chaser_speed = 1 //how fast chasers are currently var/chaser_cooldown = 50 //base cooldown/cooldown var between spawning chasers - var/major_attack_cooldown = 40 //base cooldown for major attacks + var/major_attack_cooldown = 60 //base cooldown for major attacks var/arena_cooldown = 200 //base cooldown/cooldown var for creating an arena var/blinking = FALSE //if we're doing something that requires us to stand still and not attack var/obj/effect/hierophant/spawned_beacon //the beacon we teleport back to diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 0a54b975..65a1324e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -32,7 +32,7 @@ Difficulty: Medium melee_damage_lower = 25 melee_damage_upper = 25 speed = 1 - move_to_delay = 2 + move_to_delay = 4 ranged = 1 del_on_death = 1 retreat_distance = 5 @@ -88,7 +88,7 @@ Difficulty: Medium retreat_distance = 0 minimum_distance = 0 speed = 0 - move_to_delay = 1 + move_to_delay = 2 charging = 1 addtimer(CALLBACK(src, .proc/reset_charge), 50) @@ -97,7 +97,7 @@ Difficulty: Medium retreat_distance = 5 minimum_distance = 5 speed = 1 - move_to_delay = 2 + move_to_delay = 4 charging = 0 /mob/living/simple_animal/hostile/megafauna/legion/death() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index 7229341a..0dac71d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -7,7 +7,7 @@ icon_aggro = "curseblob" mob_biotypes = MOB_SPIRIT movement_type = FLYING - move_to_delay = 5 + move_to_delay = 7 vision_range = 20 aggro_vision_range = 20 maxHealth = 40 //easy to kill, but oh, will you be seeing a lot of them. diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 4b40a966..f697d894 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -11,7 +11,7 @@ mob_biotypes = MOB_ORGANIC|MOB_BEAST vision_range = 2 aggro_vision_range = 9 - move_to_delay = 5 + move_to_delay = 7 friendly = "harmlessly rolls into" maxHealth = 45 health = 45 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 11de9df7..f6761dd1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -65,7 +65,7 @@ icon_dead = "Hivelordbrood" icon_gib = "syndicate_gib" mouse_opacity = MOUSE_OPACITY_OPAQUE - move_to_delay = 1 + move_to_delay = 3 friendly = "buzzes near" vision_range = 10 speed = 3 diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 88b5bcc3..d0dea7b8 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -10,7 +10,7 @@ icon_gib = "syndicate_gib" mob_biotypes = MOB_ORGANIC|MOB_BEAST mouse_opacity = MOUSE_OPACITY_ICON - move_to_delay = 5 + move_to_delay = 8 friendly = "floats near" speak_emote = list("puffs") vision_range = 5 @@ -88,7 +88,7 @@ F.throw_message = "is absorbed by the girth of the" F.retreat_distance = null F.minimum_distance = 1 - F.move_to_delay = 6 + F.move_to_delay = 8 F.environment_smash = ENVIRONMENT_SMASH_WALLS F.mob_size = MOB_SIZE_LARGE F.speed = 1 @@ -106,7 +106,7 @@ throw_message = "is avoided by the" retreat_distance = 9 minimum_distance = 9 - move_to_delay = 2 + move_to_delay = 3 inflate_cooldown = 4 environment_smash = ENVIRONMENT_SMASH_NONE mob_size = MOB_SIZE_SMALL diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 98209303..bca71db9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -235,15 +235,19 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA //set qdel_on_fail to have it delete W if it fails to equip //set disable_warning to disable the 'you are unable to equip that' warning. //unset redraw_mob to prevent the mob from being redrawn at the end. -/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE) +/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE, store = FALSE) if(!istype(W)) return FALSE if(!W.mob_can_equip(src, null, slot, disable_warning, bypass_equip_delay_self)) + if(store && istype(src, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = src + var/obj/item/storage/backpack/BP = H.back + if(BP) + return SEND_SIGNAL(BP, COMSIG_TRY_STORAGE_INSERT, W, null, TRUE, TRUE) if(qdel_on_fail) qdel(W) - else - if(!disable_warning) - to_chat(src, "You are unable to equip that!") + else if(!disable_warning) + to_chat(src, "You are unable to equip that!") return FALSE equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. return TRUE @@ -258,6 +262,12 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA /mob/proc/equip_to_slot_or_del(obj/item/W, slot) return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE) +/mob/proc/equip_to_slot_or_store(obj/item/W, slot) + return equip_to_slot_if_possible(W, slot, FALSE, TRUE, FALSE, TRUE, TRUE) + +/mob/proc/equip_to_slot_or_store_and_del(obj/item/W, slot) + return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, TRUE) + //puts the item "W" into an appropriate slot in a human's inventory //returns 0 if it cannot, 1 if successful /mob/proc/equip_to_appropriate_slot(obj/item/W) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 41c1ba3b..ed901ee6 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -130,6 +130,7 @@ var/updating_glide_size = TRUE var/flavor_text = "" + var/ooc_text = "" var/flavor_text_2 = "" //version of the above that only lasts for the current round. ///////TYPING INDICATORS/////// diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index b24c56fd..922d36fe 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -108,7 +108,7 @@ . = ..() if((direct & (direct - 1)) && mob.loc == n) //moved diagonally successfully - add_delay *= 2 + add_delay *= 1.66 move_delay += add_delay mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay)) if(.) // If mob is null here, we deserve the runtime diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 9c20413a..ca1c2aff 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -6,7 +6,7 @@ set src in usr if(usr != src) to_chat(usr, "No.") - var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", html_decode(flavor_text), MAX_MESSAGE_LEN, TRUE) + var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. IC only!", "Flavor Text", html_decode(flavor_text), MAX_MESSAGE_LEN, TRUE) if(msg) flavor_text = html_encode(msg) diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index eb6a9a92..6ba7625a 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -9,7 +9,7 @@ /obj/vehicle/ridden/atv/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 1 + D.vehicle_move_delay = 1.5 D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4))) D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(NORTH, OBJ_LAYER) diff --git a/code/modules/vehicles/bicycle.dm b/code/modules/vehicles/bicycle.dm index 84e0fcbe..685a4937 100644 --- a/code/modules/vehicles/bicycle.dm +++ b/code/modules/vehicles/bicycle.dm @@ -12,7 +12,7 @@ . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4))) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 1.5 /obj/vehicle/ridden/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1) if(prob(easter_egg_chance) || (SSevents.holidays && SSevents.holidays[APRIL_FOOLS])) diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 32f53a15..b8019512 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -64,6 +64,6 @@ /obj/vehicle/ridden/lavaboat/dragon/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 1 + D.vehicle_move_delay = 1.5 D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(1, 2), TEXT_SOUTH = list(1, 2), TEXT_EAST = list(1, 2), TEXT_WEST = list( 1, 2))) D.keytype = null diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 0dd7ff32..fe08c90f 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -49,7 +49,7 @@ /obj/vehicle/ridden/scooter/skateboard/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 1 + D.vehicle_move_delay = 2 D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(NORTH, OBJ_LAYER) D.set_vehicle_dir_layer(EAST, OBJ_LAYER) @@ -97,11 +97,11 @@ . = ..() var/datum/component/riding/R = src.GetComponent(/datum/component/riding) if (!adjusted_speed) - R.vehicle_move_delay = 0 + R.vehicle_move_delay = 1.5 to_chat(user, "You adjust the wheels on [src] to make it go faster.") adjusted_speed = TRUE else - R.vehicle_move_delay = 1 + R.vehicle_move_delay = 2 to_chat(user, "You adjust the wheels on [src] to make it go slower.") adjusted_speed = FALSE return TRUE @@ -176,7 +176,7 @@ /obj/vehicle/ridden/scooter/wheelys/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 2 D.set_vehicle_dir_layer(SOUTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(NORTH, OBJ_LAYER) D.set_vehicle_dir_layer(EAST, OBJ_LAYER) diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index 6526e6d8..288c0d04 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -21,7 +21,7 @@ add_overlay(overlay) var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, -8), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-10, 5), TEXT_WEST = list( 10, 5))) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 1 D.set_vehicle_dir_offsets(NORTH, -16, -16) D.set_vehicle_dir_offsets(SOUTH, -16, -16) D.set_vehicle_dir_offsets(EAST, -18, 0) @@ -54,7 +54,7 @@ . = ..() add_overlay(overlay) var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 1 D.set_riding_offsets(1, list(TEXT_NORTH = list(-10, -4), TEXT_SOUTH = list(16, 3), TEXT_EAST = list(-4, 30), TEXT_WEST = list(4, -3))) D.set_riding_offsets(2, list(TEXT_NORTH = list(19, -5, 4), TEXT_SOUTH = list(-13, 3, 4), TEXT_EAST = list(-4, -3, 4.1), TEXT_WEST = list(4, 28, 3.9))) D.set_riding_offsets(3, list(TEXT_NORTH = list(-10, -18, 4.2), TEXT_SOUTH = list(16, 25, 3.9), TEXT_EAST = list(-22, 30), TEXT_WEST = list(22, -3, 4.1))) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 2eb1a2ad..019632f0 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -15,7 +15,7 @@ /obj/vehicle/ridden/wheelchair/Initialize() . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) - D.vehicle_move_delay = 0 + D.vehicle_move_delay = 1 D.set_vehicle_dir_layer(SOUTH, OBJ_LAYER) D.set_vehicle_dir_layer(NORTH, ABOVE_MOB_LAYER) D.set_vehicle_dir_layer(EAST, OBJ_LAYER) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index bfc59e55..b5ec7e12 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -123,7 +123,8 @@ /obj/item/clothing/head/cowboyhat/white = 3, /obj/item/clothing/head/cowboyhat/pink = 3, /obj/item/clothing/shoes/cowboyboots = 3, - /obj/item/clothing/shoes/cowboyboots/black = 3) + /obj/item/clothing/shoes/cowboyboots/black = 3, + /obj/item/clothing/under/polychromic/vsweater = 3) contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3, /obj/item/clothing/under/syndicate/tacticool/skirt = 3, /obj/item/clothing/mask/balaclava = 3, diff --git a/config/config.txt b/config/config.txt index 7f572db4..a5720a80 100644 --- a/config/config.txt +++ b/config/config.txt @@ -300,7 +300,7 @@ TICK_LIMIT_MC_INIT 500 ##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second). ## This also controls the client network update rate, as well as the default client fps -#TICKLAG 0.5 +#TICKLAG 0.1 ##Can also be set as per-second value, the following value is identical to the above. FPS 20 diff --git a/config/game_options.txt b/config/game_options.txt index 0242f084..49504038 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -570,7 +570,7 @@ MONKEYCAP 64 RATCAP 64 ## Uncomment to use TG-style combat -#DISABLE_STAMBUFFER +DISABLE_STAMBUFFER ## Choose which Engine to start the round with. Weight is after the comma. Setting the weight to 0 removes the engine from rotation. BOX_RANDOM_ENGINE Box SM,3 diff --git a/html/statbrowser.html b/html/statbrowser.html index b55cfd49..1a8b229b 100644 --- a/html/statbrowser.html +++ b/html/statbrowser.html @@ -274,6 +274,9 @@ if (window.location) { var status_tab_parts = ["loading..."]; var current_tab = null; var mc_tab_parts = [["loading...", ""]]; +var examine_tab_parts = ["Mob Examine Text"]; +var examine_flavour = []; +var examine_ooc = []; var href_token = null; var spells = []; var spell_tabs = []; @@ -570,11 +573,13 @@ function tab_change(tab) { draw_tickets(); } else if(tab == "SQDL2") { draw_sqdl2(); + } else if(tab == "Examine") { + draw_examine(); }else if(tab == turfname) { draw_listedturf(); } else { var statcontentdiv = document.getElementById("statcontent"); - statcontentdiv[textContentKey] = "loading..."; + statcontentdiv[textContentKey] = "loading..."; } window.location.href = "byond://winset?statbrowser.is-visible=true"; } @@ -684,6 +689,22 @@ function draw_mc() { } document.getElementById("statcontent").appendChild(table); } + + +function update_examine(html,flavour,ooc) { + examine_tab_parts = html + } + +function draw_examine() { + var statcontentdiv = document.getElementById("statcontent"); + if(!document.getElementById("Examine")) { + createStatusTab("Examine"); + current_tab = "Examine"; + } + statcontentdiv[textContentKey] = inner; + document.getElementById("statcontent").innerHTML = examine_tab_parts; +} + function update_tickets(T){ tickets = JSON.parse(T); if(!verb_tabs.includes("Tickets")) { @@ -729,6 +750,23 @@ function remove_admin_tabs() { remove_sqdl2(); } +//mob examine +function create_mobexamine() { + remove_mobexamine(); // remove the last one if we had one + addPermanentTab("Examine"); + tab_change("Examine"); +} + +function remove_mobexamine() { + removePermanentTab("Examine"); + checkStatusTab(); + if(current_tab == "Examine") + tab_change("Status"); +} + + +//turf + function create_listedturf(TN) { remove_listedturf(); // remove the last one if we had one turfname = JSON.parse(TN); diff --git a/hyperstation/code/mobs/carrion.dm b/hyperstation/code/mobs/carrion.dm index 78f28096..2c85164a 100644 --- a/hyperstation/code/mobs/carrion.dm +++ b/hyperstation/code/mobs/carrion.dm @@ -30,7 +30,7 @@ ventcrawler = 1 death_sound = 'sound/voice/ed209_20sec.ogg' deathmessage = "lets out scream and its tentacles shrivel away..." - move_to_delay = 2 + move_to_delay = 4 loot = list(/obj/effect/gibspawner/human) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) diff --git a/hyperstation/icons/chat/chat.dmi b/hyperstation/icons/chat/chat.dmi index 1457f7f2..cf74d737 100644 Binary files a/hyperstation/icons/chat/chat.dmi and b/hyperstation/icons/chat/chat.dmi differ diff --git a/hyperstation/icons/chat/gender.dmi b/hyperstation/icons/chat/gender.dmi new file mode 100644 index 00000000..01cf65b9 Binary files /dev/null and b/hyperstation/icons/chat/gender.dmi differ diff --git a/hyperstation/icons/mob/snek.dmi b/hyperstation/icons/mob/snek.dmi index 7ea01cac..ddaed80f 100644 Binary files a/hyperstation/icons/mob/snek.dmi and b/hyperstation/icons/mob/snek.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 68b090c9..41f42a43 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi index efefb543..cfe1617e 100644 Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 9ea46443..39d166fd 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/_onclick/hud/sprint.dm b/modular_citadel/code/_onclick/hud/sprint.dm index 290fcd36..ae58134d 100644 --- a/modular_citadel/code/_onclick/hud/sprint.dm +++ b/modular_citadel/code/_onclick/hud/sprint.dm @@ -1,6 +1,6 @@ /obj/screen/mov_intent icon = 'modular_citadel/icons/ui/screen_midnight.dmi' - +/* /obj/screen/sprintbutton name = "toggle sprint" icon = 'modular_citadel/icons/ui/screen_midnight.dmi' @@ -39,3 +39,4 @@ if(L.sprint_buffer_max > 0) amount = round(CLAMP((L.sprint_buffer / L.sprint_buffer_max) * 100, 0, 100), 5) icon_state = "prog_bar_[amount]" +*/ \ No newline at end of file diff --git a/modular_citadel/code/_onclick/hud/stamina.dm b/modular_citadel/code/_onclick/hud/stamina.dm index 781b7cb2..71ad66bb 100644 --- a/modular_citadel/code/_onclick/hud/stamina.dm +++ b/modular_citadel/code/_onclick/hud/stamina.dm @@ -1,3 +1,4 @@ +/* /datum/hud/var/obj/screen/staminas/staminas /datum/hud/var/obj/screen/staminabuffer/staminabuffer @@ -76,3 +77,4 @@ return "stambuffer6" else return "stambuffer7" +*/ \ No newline at end of file diff --git a/modular_citadel/code/controllers/subsystem/job.dm b/modular_citadel/code/controllers/subsystem/job.dm index c433042a..f66cbe81 100644 --- a/modular_citadel/code/controllers/subsystem/job.dm +++ b/modular_citadel/code/controllers/subsystem/job.dm @@ -1,4 +1,4 @@ -/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff) +/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, backpackstuffs) var/mob/the_mob = N if(!the_mob) the_mob = M // cause this doesn't get assigned if player is a latejoiner @@ -10,18 +10,22 @@ G = GLOB.loadout_items[slot_to_string(initial(G.category))][initial(G.name)] if(!G) continue - var/permitted = TRUE if(G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles)) - permitted = FALSE - if(G.ckeywhitelist && G.ckeywhitelist.len && !(the_mob.client.ckey in G.ckeywhitelist)) - permitted = FALSE - if(!equipbackpackstuff && G.category == SLOT_IN_BACKPACK)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs - permitted = FALSE - if(equipbackpackstuff && G.category != SLOT_IN_BACKPACK)//ditto - permitted = FALSE - if(!permitted) continue + if(G.ckeywhitelist && G.ckeywhitelist.len && !(the_mob.client.ckey in G.ckeywhitelist)) + continue + var/obj/item/I = new G.path + if(iscarbon(M) && backpackstuffs && (G.category == SLOT_IN_BACKPACK || G.blacklist_join_equip)) + var/mob/living/carbon/C = M + var/obj/item/storage/backpack/B = C.back + if(!B || !SEND_SIGNAL(B, COMSIG_TRY_STORAGE_INSERT, I, null, TRUE, TRUE)) + I.forceMove(get_turf(C)) + continue + else if(G.blacklist_join_equip) //Assume we're gonna be put in a backpack and not equipped + continue + else if(backpackstuffs && G.category != SLOT_IN_BACKPACK) + continue if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first if(iscarbon(M)) var/mob/living/carbon/C = M diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 2422f268..9777d33c 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -35,7 +35,7 @@ #define COIN_CHARGE 3 /obj/machinery/vending/kink - name = "KinkMate" + name = "\improper KinkMate" desc = "A vending machine for all your unmentionable desires." icon = 'icons/obj/citvending.dmi' icon_state = "kink" @@ -57,6 +57,7 @@ /obj/item/clothing/neck/stole/black = 2, /obj/item/clothing/under/polychromic/stripper = 3, /obj/item/clothing/under/polychromic/bikini = 3, + /obj/item/clothing/under/polychromic/onepeice = 3, /obj/item/clothing/under/polychromic/shortpants/pantsu = 3, /obj/item/clothing/under/polychromic/bulge = 3, /obj/item/clothing/suit/maidapron = 3, @@ -66,6 +67,7 @@ /obj/item/electropack/vibrator = 2, ) contraband = list( + /obj/item/clothing/under/gear_harness = 3, /obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/under/mankini = 1, diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index 4697ce6a..82d295a0 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -383,7 +383,7 @@ if(HAS_TRAIT(H, TRAIT_HUSK)) return var/list/genitals_to_add = list() - var/list/relevant_layers = list(GENITALS_BEHIND_LAYER, GENITALS_FRONT_LAYER) //GENITALS_ADJ_LAYER removed + var/list/relevant_layers = list(GENITALS_BEHIND_LAYER, GENITALS_FRONT_LAYER, GENITALS_UNDER_LAYER) //GENITALS_ADJ_LAYER removed var/list/standing = list() var/size var/aroused_state @@ -426,15 +426,24 @@ continue var/mutable_appearance/genital_overlay = mutable_appearance(S.icon, layer = -layer) + //genitals bigger than 11 inches / g-cup will appear over clothing, if accepted + //otherwise, appear under clothing + if(G.slot == "penis" || G.slot == "testicles") + if(G.size < 3) //is actually "less than 11 inches" + genital_overlay.layer = -GENITALS_UNDER_LAYER + if(G.slot == "breasts") + var/obj/item/organ/genital/breasts/B = G + if(B.cached_size < 8) //anything smaller than a g-cup + genital_overlay.layer = -GENITALS_UNDER_LAYER + + //Get the icon genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]" colourcode = S.color_src - - if(G.slot == "belly") //we have a different size system to the rest of the genitals + if(G.slot == "belly") //we have a different size system genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi' genital_overlay.icon_state = "belly_[size]" colourcode = "belly_color" - if(S.center) genital_overlay = center_image(genital_overlay, S.dimension_x, S.dimension_y) @@ -464,4 +473,4 @@ standing = list() for(var/L in relevant_layers) - H.apply_overlay(L) \ No newline at end of file + H.apply_overlay(L) diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 641d4f2e..7d0f0543 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -19,4 +19,4 @@ name = "A diamond ring" category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/diamond - cost = 4 \ No newline at end of file + cost = 4 diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index b8cb0885..9a92afbc 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -70,4 +70,4 @@ name = "Improper Roman shield" category = SLOT_HANDS path = /obj/item/shield/riot/roman/fake - cost = 2 \ No newline at end of file + cost = 2 diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 238af10b..9b3239a5 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -27,6 +27,7 @@ name = "Rice hat" category = SLOT_HEAD path = /obj/item/clothing/head/rice_hat + blacklist_join_equip = TRUE /datum/gear/ushanka name = "Ushanka" @@ -53,12 +54,14 @@ category = SLOT_HEAD path = /obj/item/clothing/head/flakhelm cost = 2 + blacklist_join_equip = TRUE /datum/gear/delinquent //Now you too can become like your favorite punchy ghost protagonist name = "Delinquent Hat" category = SLOT_HEAD path = /obj/item/clothing/head/delinquent cost = 3 + blacklist_join_equip = TRUE /datum/gear/bunnyears name = "Bunny Ears" diff --git a/modular_citadel/code/modules/client/loadout/loadout.dm b/modular_citadel/code/modules/client/loadout/loadout.dm index f0b80f65..f184e63a 100644 --- a/modular_citadel/code/modules/client/loadout/loadout.dm +++ b/modular_citadel/code/modules/client/loadout/loadout.dm @@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/list/restricted_roles var/list/ckeywhitelist var/restricted_desc + var/blacklist_join_equip = FALSE //If we don't equip this when we join /datum/gear/New() ..() diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 062ed470..b43dd4c0 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -218,3 +218,8 @@ name = "Pharoah tunic" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/nemes + +/datum/gear/fluffcoat + name = "Winter labcoat" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/toggle/labcoat/formallab \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 62636b42..62a40d39 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -412,38 +412,45 @@ name = "Gear Harness" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/gear_harness + blacklist_join_equip = TRUE /datum/gear/pinkstripper name = "Pink stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_pink + blacklist_join_equip = TRUE /datum/gear/greenstripper name = "Green stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green + blacklist_join_equip = TRUE /datum/gear/polybikini name = "Polychromic Bikini" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/bikini cost = 2 + blacklist_join_equip = TRUE /datum/gear/polystripper name = "Polychromic Stripper Outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/stripper cost = 2 + blacklist_join_equip = TRUE /datum/gear/polypantsu name = "Polychromic Panties" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/shortpants/pantsu + blacklist_join_equip = TRUE /datum/gear/polybulge name = "Polychromic Voluminous Thong" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/bulge + blacklist_join_equip = TRUE /datum/gear/polybottomless name = "Polychromic Bottomless Shirt" @@ -451,23 +458,25 @@ path = /obj/item/clothing/under/polychromic/bottomless cost = 2 -/datum/gear/corset - name = "Corset" +/datum/gear/polysweatervirgin + name = "Polychromic Virginkiller Sweater" category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/corset - cost = 1 + path = /obj/item/clothing/under/polychromic/vsweater + cost = 2 /datum/gear/corset name = "Corset" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/corset cost = 1 + blacklist_join_equip = TRUE /datum/gear/shortsbra name = "Kromatic Shorts and Top" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/shortsbra cost = 1 + blacklist_join_equip = TRUE /datum/gear/gladiator name = "Gladiator uniform" @@ -486,4 +495,4 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/greenplaidshirt cost = 1 - ckeywhitelist = list("chemlight") \ No newline at end of file + ckeywhitelist = list("chemlight") diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm index 827b797c..debb359d 100644 --- a/modular_citadel/code/modules/client/preferences.dm +++ b/modular_citadel/code/modules/client/preferences.dm @@ -57,6 +57,7 @@ datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1) ..() character.give_genitals(TRUE) character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially + character.ooc_text = features["ooc_text"] //Let's update their flavor_text at least initially character.canbearoused = arousable character.client?.prefs.lewdchem = lewdchem if(icon_updates) diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index f7f8e189..e949aacd 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -7,6 +7,7 @@ features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list) //Citadel features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"])) + features["ooc_text"] = sanitize_text(features["ooc_text"], initial(features["ooc_text"])) if(!features["mcolor2"] || features["mcolor"] == "#000") features["mcolor2"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") if(!features["mcolor3"] || features["mcolor"] == "#000") @@ -84,6 +85,7 @@ WRITE_FILE(S["feature_can_get_preg"], features["can_get_preg"]) //flavor text WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) + WRITE_FILE(S["feature_ooc_text"], features["ooc_text"]) //custom job titles WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences) //belly diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index 1a26629e..a5514898 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -209,4 +209,26 @@ primary_color = "#808080" //RGB in hexcode secondary_color = "#FFFFFF" hastertiary = FALSE - body_parts_covered= CHEST|GROIN \ No newline at end of file + body_parts_covered= CHEST|GROIN + +/obj/item/clothing/under/polychromic/vsweater + name = "virgin killer sweater" + desc = "A sweater designed to be as provocative as possible, with almost all of the back missing, bairly hiding anything from that angle. Warning: Doesn't actually kill virgins." + icon_state = "vkiller" + item_color = "vkiller" + item_state = "rainbow" + primary_color = "#E1D6C9" //RGB in hexcode + secondary_color = "#FFFFFF" + hastertiary = FALSE + body_parts_covered= CHEST|GROIN + +/obj/item/clothing/under/polychromic/onepeice + name = "polychromic swimsuit" + desc = "Perfect for summer, and those who want to have something with a bit more material." + icon_state = "onepeice" + item_color = "onepeice" + item_state = "rainbow" + primary_color = "#010052" //RGB in hexcode + secondary_color = "#eb7a7a" + tertiary_color = "#ffffff" + body_parts_covered = CHEST|GROIN \ No newline at end of file diff --git a/modular_citadel/code/modules/jobs/dresscode_values.dm b/modular_citadel/code/modules/jobs/dresscode_values.dm deleted file mode 100644 index 24cd5c5a..00000000 --- a/modular_citadel/code/modules/jobs/dresscode_values.dm +++ /dev/null @@ -1,8 +0,0 @@ -//This file controls whether or not a job complies with dresscodes. -//If a job complies with dresscodes, loadout items will not be equipped instead of the job's outfit, instead placing the items into the player's backpack. - -/datum/job - var/dresscodecompliant = TRUE - -/datum/job/assistant - dresscodecompliant = FALSE \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index 355726e8..bf5b49fb 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -42,6 +42,12 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' +/datum/sprite_accessory/body_markings/gecko + name = "Gecko" + icon_state = "gecko" + color_src = MATRIXED + icon = 'modular_citadel/icons/mob/markings_notmammals.dmi' + /datum/sprite_accessory/tails/lizard/guilmon name = "Guilmon" icon_state = "guilmon" @@ -54,6 +60,18 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_tails.dmi' +/datum/sprite_accessory/tails/lizard/gecko + name = "Gecko" + icon_state = "gecko" + color_src = MATRIXED + icon = 'modular_citadel/icons/mob/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/lizard/gecko + name = "Gecko" + icon_state = "gecko" + color_src = MATRIXED + icon = 'modular_citadel/icons/mob/mam_tails.dmi' + //christ this was a mistake, but it's here just in case someone wants to selectively fix /************* Lizard compatable snoots *********** /datum/sprite_accessory/snouts/bird @@ -1018,6 +1036,11 @@ datum/sprite_accessory/ears/human/gret name = "Synthetic Lizard - Spectre" icon_state = "synthlizspectre" +/datum/sprite_accessory/mam_snouts/synthliz/synthlizvenom + color_src = MATRIXED + name = "Synthetic Lizard - V3/NM" + icon_state = "synthlizvenom" + /****************************************** **************** Snouts ******************* *************but higher up*****************/ @@ -2212,6 +2235,11 @@ datum/sprite_accessory/mam_tails/insect name = "Synthetic Lizard - Cobra Hood" icon_state = "synth_cobrahood" +/datum/sprite_accessory/antenna/synthliz/synthliz_cobraslim + color_src = MATRIXED + name = "Synthetic Lizard - Narrow Cobra Hood" + icon_state = "synth_cobraslim" + // *** Snooooow flaaaaake *** /datum/sprite_accessory/horns/guilmon diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm index 7264d95b..3c8ef1d7 100644 --- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm +++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm @@ -19,13 +19,14 @@ incomingstammult = max(0.01, incomingstammult/(amount*0.05)) return amount +/* /mob/living/carbon/doSprintLossTiles(tiles) doSprintBufferRegen(FALSE) //first regen. if(sprint_buffer) var/use = min(tiles, sprint_buffer) sprint_buffer -= use tiles -= use - update_hud_sprint_bar() +// update_hud_sprint_bar() if(!tiles) //we had enough, we're done! return adjustStaminaLoss(tiles * sprint_stamina_cost) //use stamina to cover deficit. @@ -34,5 +35,4 @@ var/diff = world.time - sprint_buffer_regen_last sprint_buffer_regen_last = world.time sprint_buffer = min(sprint_buffer_max, sprint_buffer + sprint_buffer_regen_ds * diff) - if(updating) - update_hud_sprint_bar() +*/ \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm index 409864c9..f9ed0a01 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm @@ -20,6 +20,7 @@ . += 1 . += ..() +/* /mob/living/carbon/human/proc/togglesprint() // If you call this proc outside of hotkeys or clicking the HUD button, I'll be disappointed in you. sprinting = !sprinting if(!resting && m_intent == MOVE_INTENT_RUN && canmove) @@ -27,11 +28,12 @@ playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE) else playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE) - if(hud_used && hud_used.static_inventory) - for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory) - selector.insert_witty_toggle_joke_here(src) +// if(hud_used && hud_used.static_inventory) +// for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory) +// selector.insert_witty_toggle_joke_here(src) return TRUE /mob/living/carbon/human/proc/sprint_hotkey(targetstatus) if(targetstatus ? !sprinting : sprinting) togglesprint() +*/ \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/living/carbon/human/life.dm b/modular_citadel/code/modules/mob/living/carbon/human/life.dm index e728d70c..478eb055 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/life.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/life.dm @@ -15,7 +15,7 @@ . = ..() if(!client || !hud_used) return - if(hud_used.staminas) - hud_used.staminas.icon_state = staminahudamount() - if(hud_used.staminabuffer) - hud_used.staminabuffer.icon_state = staminabufferhudamount() +// if(hud_used.staminas) +// hud_used.staminas.icon_state = staminahudamount() +// if(hud_used.staminabuffer) +// hud_used.staminabuffer.icon_state = staminabufferhudamount() diff --git a/modular_citadel/code/modules/mob/living/carbon/life.dm b/modular_citadel/code/modules/mob/living/carbon/life.dm index e94bd759..544bd821 100644 --- a/modular_citadel/code/modules/mob/living/carbon/life.dm +++ b/modular_citadel/code/modules/mob/living/carbon/life.dm @@ -1,3 +1,2 @@ /mob/living/carbon/Life() - . = ..() - doSprintBufferRegen() + . = ..() \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm index ed33041d..5ec2ab8c 100644 --- a/modular_citadel/code/modules/mob/living/living.dm +++ b/modular_citadel/code/modules/mob/living/living.dm @@ -127,6 +127,8 @@ update_canmove() update_health_hud() +/* /mob/living/proc/update_hud_sprint_bar() if(hud_used && hud_used.sprint_buffer) hud_used.sprint_buffer.update_to_mob(src) +*/ \ No newline at end of file diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm index c7a2447b..d32d560b 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -3,15 +3,12 @@ /mob/living/silicon/robot/Move(NewLoc, direct) . = ..() - if(. && sprinting && !(movement_type & FLYING) && canmove && !resting) - if(!(cell?.use(25))) - togglesprint(TRUE) /mob/living/silicon/robot/movement_delay() . = ..() if(!resting && !sprinting) . += 1 - +/* /mob/living/silicon/robot/proc/togglesprint(shutdown = FALSE) //Basically a copypaste of the proc from /mob/living/carbon/human if(!shutdown && (!cell || cell.charge < 25)) return FALSE @@ -23,11 +20,12 @@ if(shutdown) playsound_local(src, 'sound/effects/light_flicker.ogg', 50, FALSE, pressure_affected = FALSE) playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE) - if(hud_used && hud_used.static_inventory) - for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory) - selector.insert_witty_toggle_joke_here(src) +// if(hud_used && hud_used.static_inventory) +// for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory) +// selector.insert_witty_toggle_joke_here(src) return TRUE /mob/living/silicon/robot/proc/sprint_hotkey(targetstatus) if(targetstatus ? !sprinting : sprinting) togglesprint() +*/ \ No newline at end of file diff --git a/modular_citadel/icons/mob/ipc_antennas.dmi b/modular_citadel/icons/mob/ipc_antennas.dmi index 3c0416f4..e469abab 100644 Binary files a/modular_citadel/icons/mob/ipc_antennas.dmi and b/modular_citadel/icons/mob/ipc_antennas.dmi differ diff --git a/modular_citadel/icons/mob/mam_snouts.dmi b/modular_citadel/icons/mob/mam_snouts.dmi index 82d2603c..8ede8c3f 100644 Binary files a/modular_citadel/icons/mob/mam_snouts.dmi and b/modular_citadel/icons/mob/mam_snouts.dmi differ diff --git a/modular_citadel/icons/mob/mam_tails.dmi b/modular_citadel/icons/mob/mam_tails.dmi index 02b5cc91..5db55a6b 100644 Binary files a/modular_citadel/icons/mob/mam_tails.dmi and b/modular_citadel/icons/mob/mam_tails.dmi differ diff --git a/modular_citadel/icons/mob/markings_notmammals.dmi b/modular_citadel/icons/mob/markings_notmammals.dmi index 9ef0b9ef..a03c31ee 100644 Binary files a/modular_citadel/icons/mob/markings_notmammals.dmi and b/modular_citadel/icons/mob/markings_notmammals.dmi differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 5c4c534a..23018f84 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index 42e122d9..274a4a77 100644 Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and b/modular_citadel/icons/polyclothes/item/uniform.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index b698c210..07d3b1aa 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ diff --git a/modular_citadel/icons/ui/screen_clockwork.dmi b/modular_citadel/icons/ui/screen_clockwork.dmi index 5dc3f8f9..3b64b182 100644 Binary files a/modular_citadel/icons/ui/screen_clockwork.dmi and b/modular_citadel/icons/ui/screen_clockwork.dmi differ diff --git a/modular_citadel/icons/ui/screen_midnight.dmi b/modular_citadel/icons/ui/screen_midnight.dmi index a64da1d5..3c1165a2 100644 Binary files a/modular_citadel/icons/ui/screen_midnight.dmi and b/modular_citadel/icons/ui/screen_midnight.dmi differ diff --git a/modular_citadel/icons/ui/screen_operative.dmi b/modular_citadel/icons/ui/screen_operative.dmi index 52b545fb..7a0a1267 100644 Binary files a/modular_citadel/icons/ui/screen_operative.dmi and b/modular_citadel/icons/ui/screen_operative.dmi differ diff --git a/modular_citadel/icons/ui/screen_plasmafire.dmi b/modular_citadel/icons/ui/screen_plasmafire.dmi index 95283994..39d55c5a 100644 Binary files a/modular_citadel/icons/ui/screen_plasmafire.dmi and b/modular_citadel/icons/ui/screen_plasmafire.dmi differ diff --git a/modular_citadel/icons/ui/screen_slimecore.dmi b/modular_citadel/icons/ui/screen_slimecore.dmi index 20e1c05b..7e8ac920 100644 Binary files a/modular_citadel/icons/ui/screen_slimecore.dmi and b/modular_citadel/icons/ui/screen_slimecore.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e0ed25d6..61935be2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1212,6 +1212,7 @@ #include "code\modules\admin\verbs\SDQL2\SDQL_2.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm" #include "code\modules\admin\verbs\SDQL2\SDQL_2_wrappers.dm" +#include "code\modules\admin\view_variables\debug_variables.dm" #include "code\modules\antagonists\_common\antag_datum.dm" #include "code\modules\antagonists\_common\antag_helpers.dm" #include "code\modules\antagonists\_common\antag_hud.dm" @@ -3229,7 +3230,6 @@ #include "modular_citadel\code\modules\events\blob.dm" #include "modular_citadel\code\modules\events\wizard\magicarp.dm" #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm" -#include "modular_citadel\code\modules\jobs\dresscode_values.dm" #include "modular_citadel\code\modules\mentor\follow.dm" #include "modular_citadel\code\modules\mentor\mentor.dm" #include "modular_citadel\code\modules\mentor\mentor_memo.dm" diff --git a/tgui/package-lock.json b/tgui/package-lock.json index 7acb8e02..58490bd3 100644 --- a/tgui/package-lock.json +++ b/tgui/package-lock.json @@ -2755,17 +2755,29 @@ "integrity": "sha1-dk6IfKkQTQGgrI6r7n38DizhQQQ=" }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + } } }, "end-of-stream": { | ||||||||||||||||||||||